watch command stop works with panic, fix #1166

Slach · Slach · commit a9f9ce80bd35 · 2025-06-17T22:18:44.000+04:00
Signed-off-by: Slach &lt;bloodjazman@gmail.com&gt;
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.6.23
+BUG FIXES
+- `watch` command stop works with panic, fix [1166](https://github.com/Altinity/clickhouse-backup/issues/1166), affected versions 2.6.19-2.6.22 after [1152](https://github.com/Altinity/clickhouse-backup/issues/1152)
+
 # v2.6.22
 BUG FIXES
 - fix corner cases when `server --watch` aborts watch process when `backups_to_keep_local: -1` and `--watch-delete-source=false`, fix [1157](https://github.com/Altinity/clickhouse-backup/issues/1157), fix [1156](https://github.com/Altinity/clickhouse-backup/issues/1156), thanks @elliott-logrocket 
diff --git a/pkg/backup/watch.go b/pkg/backup/watch.go
@@ -207,7 +207,11 @@ func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, t
 				}
 			}
 			// https://github.com/Altinity/clickhouse-backup/issues/1152
+			// https://github.com/Altinity/clickhouse-backup/issues/1166
 			go func() {
+				if metrics == nil {
+					return
+				}
 				remoteBackups, listRemoteErr := b.GetRemoteBackups(ctx, false)
 				if listRemoteErr == nil && len(remoteBackups) > 0 {
 					numberBackupsRemote := len(remoteBackups)

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,11 @@ func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, t`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`	`// https://github.com/Altinity/clickhouse-backup/issues/1152`
	`210`	`+ // https://github.com/Altinity/clickhouse-backup/issues/1166`
`210`	`211`	`go func() {`
	`212`	`+ if metrics == nil {`
	`213`	`+ return`
	`214`	`+ }`
`211`	`215`	`remoteBackups, listRemoteErr := b.GetRemoteBackups(ctx, false)`
`212`	`216`	`if listRemoteErr == nil && len(remoteBackups) > 0 {`
`213`	`217`	`numberBackupsRemote := len(remoteBackups)`