Skip to content

Commit 29be459

Browse files
authored
Merge pull request #2740 from luvs01/fix/storage-policy-metadata-race
fix(storage): atomically commit cleanup run metadata
2 parents 50e9556 + 1f07b68 commit 29be459

15 files changed

Lines changed: 405 additions & 27 deletions

File tree

‎gui/src/i18n/de.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,6 +1685,7 @@ export const de: Record<TKey, string> = {
16851685
"storage.policy.skippedEmpty": "Keine Archivkandidaten passend zum Ziel.",
16861686
"storage.policy.doneQuarantine": "Richtlinie hat {count} Datei(en) in Quarantäne ({size}).",
16871687
"storage.policy.donePermanent": "Richtlinie hat {count} Datei(en) endgültig gelöscht ({size}).",
1688+
"storage.policy.metadataSaveWarning": "Der Richtlinienlauf wurde beendet, aber seine Planungsmetadaten konnten nicht gespeichert werden.",
16881689
"modal.back": "Zurück",
16891690
"modal.badge.oauth": "OAuth",
16901691
"modal.customProvider": "Benutzerdefinierter Anbieter",

‎gui/src/i18n/en.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@ export const en = {
10071007
"storage.policy.skippedEmpty": "No archived candidates matched the target.",
10081008
"storage.policy.doneQuarantine": "Policy quarantined {count} file(s) ({size}).",
10091009
"storage.policy.donePermanent": "Policy permanently deleted {count} file(s) ({size}).",
1010+
"storage.policy.metadataSaveWarning": "The policy run finished, but its scheduling metadata could not be saved.",
10101011

10111012
// add-provider modal
10121013
"modal.addNamed": "Add: {label}",

‎gui/src/i18n/fr.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,7 @@ export const fr: Record<TKey, string> = {
982982
"storage.policy.skippedEmpty": "Aucune archive candidate ne correspond à l’objectif.",
983983
"storage.policy.doneQuarantine": "La politique a mis {count} fichier(s) en quarantaine ({size}).",
984984
"storage.policy.donePermanent": "La politique a supprimé définitivement {count} fichier(s) ({size}).",
985+
"storage.policy.metadataSaveWarning": "L’exécution de la politique est terminée, mais ses métadonnées de planification n’ont pas pu être enregistrées.",
985986
"modal.addNamed": "Ajouter : {label}",
986987
"modal.add": "Ajouter un fournisseur",
987988
"modal.search": "Rechercher des fournisseurs…",

‎gui/src/i18n/ja.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,7 @@ export const ja: Record<TKey, string> = {
950950
"storage.policy.skippedEmpty": "目標に合うアーカイブ候補がありません。",
951951
"storage.policy.doneQuarantine": "方針が {count} 件を隔離しました({size})。",
952952
"storage.policy.donePermanent": "方針が {count} 件を完全削除しました({size})。",
953+
"storage.policy.metadataSaveWarning": "方針の実行は完了しましたが、スケジュールのメタデータを保存できませんでした。",
953954

954955
// add-provider modal
955956
"modal.addNamed": "追加: {label}",

‎gui/src/i18n/ko.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,6 +1712,7 @@ export const ko: Record<TKey, string> = {
17121712
"storage.policy.skippedEmpty": "목표에 맞는 보관 후보가 없습니다.",
17131713
"storage.policy.doneQuarantine": "정책이 파일 {count}개를 격리했습니다({size}).",
17141714
"storage.policy.donePermanent": "정책이 파일 {count}개를 영구 삭제했습니다({size}).",
1715+
"storage.policy.metadataSaveWarning": "정책 실행은 완료됐지만 일정 메타데이터를 저장하지 못했습니다.",
17151716
"modal.back": "뒤로",
17161717
"modal.badge.oauth": "OAuth",
17171718
"modal.customProvider": "사용자 지정 프로바이더",

‎gui/src/i18n/ru.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@ export const ru: Record<TKey, string> = {
991991
"storage.policy.skippedEmpty": "Нет архивных кандидатов под цель.",
992992
"storage.policy.doneQuarantine": "Политика отправила в карантин {count} файл(ов) ({size}).",
993993
"storage.policy.donePermanent": "Политика навсегда удалила {count} файл(ов) ({size}).",
994+
"storage.policy.metadataSaveWarning": "Выполнение политики завершено, но не удалось сохранить метаданные расписания.",
994995

995996
// add-provider modal
996997
"modal.addNamed": "Добавить: {label}",

‎gui/src/i18n/tr.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,7 @@ export const tr: Record<TKey, string> = {
998998
"storage.policy.skippedEmpty": "Hedefle eşleşen aday yok.",
999999
"storage.policy.doneQuarantine": "Politika {count} dosyayı karantinaya aldı ({size}).",
10001000
"storage.policy.donePermanent": "Politika {count} dosyayı kalıcı olarak sildi ({size}).",
1001+
"storage.policy.metadataSaveWarning": "Politika çalışması tamamlandı ancak zamanlama meta verileri kaydedilemedi.",
10011002

10021003
// add-provider modal
10031004
"modal.addNamed": "Ekle: {label}",

‎gui/src/i18n/zh-TW.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@ export const zhTW: Record<TKey, string> = {
795795
"storage.policy.skippedEmpty": "沒有匹配目標的歸檔候選項。",
796796
"storage.policy.doneQuarantine": "策略已隔離 {count} 個檔案({size})。",
797797
"storage.policy.donePermanent": "策略已永久刪除 {count} 個檔案({size})。",
798+
"storage.policy.metadataSaveWarning": "策略執行已完成,但無法儲存其排程中繼資料。",
798799
"modal.addNamed": "新增:{label}",
799800
"modal.add": "新增供應商",
800801
"modal.search": "搜尋供應商…",

‎gui/src/i18n/zh.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,6 +1705,7 @@ export const zh: Record<TKey, string> = {
17051705
"storage.policy.skippedEmpty": "没有匹配目标的归档候选项。",
17061706
"storage.policy.doneQuarantine": "策略已隔离 {count} 个文件({size})。",
17071707
"storage.policy.donePermanent": "策略已永久删除 {count} 个文件({size})。",
1708+
"storage.policy.metadataSaveWarning": "策略运行已完成,但无法保存其调度元数据。",
17081709
"modal.back": "返回",
17091710
"modal.badge.oauth": "OAuth",
17101711
"modal.customProvider": "自定义提供方",

‎gui/src/pages/Storage.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ interface CleanupPolicy {
7474
skipped?: string;
7575
deferred?: string;
7676
error?: string;
77+
metadataPersistenceError?: "missing" | "invalid" | "conflict" | "write_failed";
7778
mode?: string;
7879
freedBytes?: number;
7980
removed?: number;
@@ -888,6 +889,9 @@ function AutoCleanupPolicyPanel({
888889

889890
if (outcome.skipped === "disabled") {
890891
setStatus(t("storage.policy.skippedDisabled"));
892+
} else if (outcome.ok && outcome.metadataPersistenceError) {
893+
setError(t("storage.policy.metadataSaveWarning"));
894+
if (outcome.removed !== undefined) onDone();
891895
} else if (outcome.skipped === "under_threshold") {
892896
setStatus(t("storage.policy.skippedUnder"));
893897
} else if (outcome.skipped === "nothing_selected") {

0 commit comments

Comments
 (0)