fix wrong cleanup *.state2 file in ResumeOperationsAfterRestart, after 2.6.12 #1126, fix #1133

Slach · Slach · commit e7047ce926e0 · 2025-04-11T21:40:57.000+03:00
Signed-off-by: Slach &lt;bloodjazman@gmail.com&gt;
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.6.15
+BUG FIXES
+- fix wrong cleanup *.state2 file in ResumeOperationsAfterRestart, after 2.6.12 [1126](https://github.com/Altinity/clickhouse-backup/issues/1126), fix [1133](https://github.com/Altinity/clickhouse-backup/issues/1133)
+
 # v2.6.14
 BUG FIXES
 - fix restore RBAC, fix [1130](https://github.com/Altinity/clickhouse-backup/pull/1130), thanks @yudhiesh
diff --git a/pkg/resumable/state.go b/pkg/resumable/state.go
@@ -90,9 +90,6 @@ func (s *State) CleanupStateIfParamsChange(params map[string]interface{}) {
 		return
 	}
 	needCleanup := false
-	if s.params != nil && params == nil {
-		needCleanup = true
-	}
 	if s.params != nil && params != nil && !common.CompareMaps(s.params, params) {
 		needCleanup = true
 	}

Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,6 @@ func (s *State) CleanupStateIfParamsChange(params map[string]interface{}) {`
`90`	`90`	`return`
`91`	`91`	`}`
`92`	`92`	`needCleanup := false`
`93`		`- if s.params != nil && params == nil {`
`94`		`- needCleanup = true`
`95`		`- }`
`96`	`93`	`if s.params != nil && params != nil && !common.CompareMaps(s.params, params) {`
`97`	`94`	`needCleanup = true`
`98`	`95`	`}`