fix watch unexpected connection closed behavior, fix [568](Altinity#568)

Slach · Slach · commit e46bcebeb75f · 2022-12-19T22:04:21.000+04:00
Signed-off-by: Slach &lt;bloodjazman@gmail.com&gt;
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -14,6 +14,7 @@ BUG FIXES
 - `MaterializedPostgreSQL` doesn't support FREEZE, fix [550](https://github.com/AlexAkulov/clickhouse-backup/issues/550), see also https://github.com/ClickHouse/ClickHouse/issues/32902, https://github.com/ClickHouse/ClickHouse/issues/44252
 - `create` and `restore` commands will respect `skip_tables` config options and `--table` cli parameter, to avoid create unnecessary empty databases, fix [583](https://github.com/AlexAkulov/clickhouse-backup/issues/583)
 - fix `watch` unexpected connection closed behavior, fix [568](https://github.com/AlexAkulov/clickhouse-backup/issues/568)
+- fix `watch` validation parameters corner cases, close [569](https://github.com/AlexAkulov/clickhouse-backup/pull/569)
 
 # v2.1.2
 IMPROVEMENTS
diff --git a/pkg/backup/watch.go b/pkg/backup/watch.go
@@ -53,8 +53,8 @@ func (b *Backuper) ValidateWatchParams(watchInterval, fullInterval, watchBackupN
 	if watchBackupNameTemplate != "" {
 		b.cfg.General.WatchBackupNameTemplate = watchBackupNameTemplate
 	}
-	if b.cfg.General.FullDuration.Seconds() < b.cfg.General.WatchDuration.Seconds()*float64(b.cfg.General.BackupsToKeepRemote) {
-		return fmt.Errorf("fullInterval `%s` is not enought to keep %d remote backups with watchInterval `%s`", b.cfg.General.FullInterval, b.cfg.General.BackupsToKeepRemote, b.cfg.General.WatchInterval)
+	if b.cfg.General.BackupsToKeepRemote > 0 && b.cfg.General.WatchDuration.Seconds()*float64(b.cfg.General.BackupsToKeepRemote) < b.cfg.General.FullDuration.Seconds() {
+		return fmt.Errorf("fullInterval `%s` is too long to keep %d remote backups with watchInterval `%s`", b.cfg.General.FullInterval, b.cfg.General.BackupsToKeepRemote, b.cfg.General.WatchInterval)
 	}
 	return nil
 }
@@ -87,12 +87,10 @@ func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, t
 	var createRemoteErr error
 	var deleteLocalErr error
 	for {
-		b.log.Warnf("SUKA!!! b.ch.IsOpen=%v", b.ch.IsOpen)
 		if !b.ch.IsOpen {
 			if err = b.ch.Connect(); err != nil {
 				return err
 			}
-			b.log.Warnf("BLA!!! b.ch.IsOpen=%v", b.ch.IsOpen)
 		}
 		select {
 		case <-ctx.Done():

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ func (b *Backuper) ValidateWatchParams(watchInterval, fullInterval, watchBackupN`
`53`	`53`	`if watchBackupNameTemplate != "" {`
`54`	`54`	`b.cfg.General.WatchBackupNameTemplate = watchBackupNameTemplate`
`55`	`55`	`}`
`56`		`- if b.cfg.General.FullDuration.Seconds() < b.cfg.General.WatchDuration.Seconds()*float64(b.cfg.General.BackupsToKeepRemote) {`
`57`		- return fmt.Errorf("fullInterval `%s` is not enought to keep %d remote backups with watchInterval `%s`", b.cfg.General.FullInterval, b.cfg.General.BackupsToKeepRemote, b.cfg.General.WatchInterval)
	`56`	`+ if b.cfg.General.BackupsToKeepRemote > 0 && b.cfg.General.WatchDuration.Seconds()*float64(b.cfg.General.BackupsToKeepRemote) < b.cfg.General.FullDuration.Seconds() {`
	`57`	+ return fmt.Errorf("fullInterval `%s` is too long to keep %d remote backups with watchInterval `%s`", b.cfg.General.FullInterval, b.cfg.General.BackupsToKeepRemote, b.cfg.General.WatchInterval)
`58`	`58`	`}`
`59`	`59`	`return nil`
`60`	`60`	`}`
`@@ -87,12 +87,10 @@ func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, t`
`87`	`87`	`var createRemoteErr error`
`88`	`88`	`var deleteLocalErr error`
`89`	`89`	`for {`
`90`		`- b.log.Warnf("SUKA!!! b.ch.IsOpen=%v", b.ch.IsOpen)`
`91`	`90`	`if !b.ch.IsOpen {`
`92`	`91`	`if err = b.ch.Connect(); err != nil {`
`93`	`92`	`return err`
`94`	`93`	`}`
`95`		`- b.log.Warnf("BLA!!! b.ch.IsOpen=%v", b.ch.IsOpen)`
`96`	`94`	`}`
`97`	`95`	`select {`
`98`	`96`	`case <-ctx.Done():`