fix corner cases for ResumeOperationsAfterRestart and keep_backup_local: -1 behavior

Slach · Slach · commit 2ba936b9d52c · 2024-05-08T12:57:28.000+04:00
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)

Original file line number	Diff line number	Diff line change
`@@ -1641,8 +1641,12 @@ func (api *APIServer) ResumeOperationsAfterRestart() error {`
`1641`	`1641`	`if err != nil {`
`1642`	`1642`	`return err`
`1643`	`1643`	`}`
	`1644`	`+`
`1644`	`1645`	`if err = os.Remove(stateFile); err != nil {`
`1645`		`- return err`
	`1646`	`+ if api.config.General.BackupsToKeepLocal >= 0 {`
	`1647`	`+ return err`
	`1648`	`+ }`
	`1649`	`+ api.log.WithField("operation", "ResumeOperationsAfterRestart").Warnf("remove %s return error: ", err)`
`1646`	`1650`	`}`
`1647`	`1651`	`default:`
`1648`	`1652`	`return fmt.Errorf("unkown command for state file %s", stateFile)`