fix corner cases for ResumeOperationsAfterRestart and `keep_backup_…

…local: -1` behavior
Altinity · May 8, 2024 · 2ba936b · 2ba936b
1 parent f46b452
commit 2ba936b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.5.8
+BUG FIXES
+- fix corner cases for `ResumeOperationsAfterRestart` and `keep_backup_local: -1` behavior
+
 # v2.5.7
 BUG FIXES
 - wrong skip tables by engine when empty variables value `CLICKHOUSE_SKIP_TABLE_ENGINES=engine,` instead of `CLICKHOUSE_SKIP_TABLE_ENGINES=engine` fix [915](https://github.com/Altinity/clickhouse-backup/issues/915)

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -1641,8 +1641,12 @@ func (api *APIServer) ResumeOperationsAfterRestart() error {
 					if err != nil {
 						return err
 					}
+
 					if err = os.Remove(stateFile); err != nil {
-						return err
+						if api.config.General.BackupsToKeepLocal >= 0 {
+							return err
+						}
+						api.log.WithField("operation", "ResumeOperationsAfterRestart").Warnf("remove %s return error: ", err)
 					}
 				default:
 					return fmt.Errorf("unkown command for state file %s", stateFile)