time layout for watch backup name shall respect TZ environment variable, fix #1184

Slach · Slach · commit d5fa1f264fe7 · 2025-07-15T20:15:25.000+05:00
Signed-off-by: Slach &lt;bloodjazman@gmail.com&gt;
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.6.28
+BUG FIXES
+- time layout for watch backup name shall respect TZ environment variable, fix [1184](https://github.com/Altinity/clickhouse-backup/issues/1184)
+
 # v2.6.27
 IMPROVEMENTS
 - add config option `configuration_backup_always` (default false), fix [1180](https://github.com/Altinity/clickhouse-backup/issues/1180)
diff --git a/pkg/backup/watch.go b/pkg/backup/watch.go
@@ -25,7 +25,7 @@ func (b *Backuper) NewBackupWatchName(ctx context.Context, backupType string) (s
 		for _, group := range watchBackupTemplateTimeRE.FindAllStringSubmatch(backupName, -1) {
 			templateItem := group[0]
 			layout := group[1]
-			backupName = strings.ReplaceAll(backupName, templateItem, time.Now().UTC().Format(layout))
+			backupName = strings.ReplaceAll(backupName, templateItem, time.Now().Format(layout))
 		}
 	} else {
 		return "", fmt.Errorf("watch_backup_name_template doesn't contain {time:layout}, backup name will non unique")

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (b *Backuper) NewBackupWatchName(ctx context.Context, backupType string) (s`
`25`	`25`	`for _, group := range watchBackupTemplateTimeRE.FindAllStringSubmatch(backupName, -1) {`
`26`	`26`	`templateItem := group[0]`
`27`	`27`	`layout := group[1]`
`28`		`- backupName = strings.ReplaceAll(backupName, templateItem, time.Now().UTC().Format(layout))`
	`28`	`+ backupName = strings.ReplaceAll(backupName, templateItem, time.Now().Format(layout))`
`29`	`29`	`}`
`30`	`30`	`} else {`
`31`	`31`	`return "", fmt.Errorf("watch_backup_name_template doesn't contain {time:layout}, backup name will non unique")`