upload will delete local backup if upload successful, fix #834

Altinity · Feb 16, 2024 · 5ab0892 · 5ab0892
1 parent e9428d1
commit 5ab0892
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,11 +1,11 @@
 # v2.4.31
 IMPROVEMENTS
 - add `check_sum_algorithm` parameter for `s3` config section with "" default value, to avoid useless CPU usage during upload to `S3` storage, additional fix [829](https://github.com/Altinity/clickhouse-backup/issues/829) 
+- `upload` will delete local backup if upload successful, fix [834](https://github.com/Altinity/clickhouse-backup/issues/834) 
 
 BUG FIXES
 - fix miss checksum for CopyObject in `s3`, fix [835](https://github.com/Altinity/clickhouse-backup/issues/835), affected 2.4.30
-- fix wrong behavior for `restore --rbac-only` and `restore --rbac` for backups which not contains any schema, fix [832](https://github.com/Altinity/clickhouse-backup/issues/832)   
-
+- fix wrong behavior for `restore --rbac-only` and `restore --rbac` for backups which not contains any schema, fix [832](https://github.com/Altinity/clickhouse-backup/issues/832)
 # v2.4.30
 BUG FIXES
 - fix `download` command corner cases for increment backup for tables with projections, fix [830](https://github.com/Altinity/clickhouse-backup/issues/830)

diff --git a/pkg/backup/create_remote.go b/pkg/backup/create_remote.go
@@ -2,7 +2,6 @@ package backup
 
 import (
 	"context"
-	"fmt"
 	"github.com/Altinity/clickhouse-backup/v2/pkg/status"
 )
 
@@ -23,8 +22,5 @@ func (b *Backuper) CreateToRemote(backupName, diffFrom, diffFromRemote, tablePat
 		return err
 	}
 
-	if err := b.RemoveOldBackupsLocal(ctx, false, nil); err != nil {
-		return fmt.Errorf("can't remove old local backups: %v", err)
-	}
 	return nil
 }
diff --git a/pkg/backup/upload.go b/pkg/backup/upload.go
@@ -235,6 +235,11 @@ func (b *Backuper) Upload(backupName, diffFrom, diffFromRemote, tablePattern str
 	if err = b.RemoveOldBackupsRemote(ctx); err != nil {
 		return fmt.Errorf("can't remove old backups on remote storage: %v", err)
 	}
+	// fix https://github.com/Altinity/clickhouse-backup/issues/834
+	if err = b.RemoveOldBackupsLocal(ctx, false, nil); err != nil {
+		return fmt.Errorf("can't remove old local backups: %v", err)
+	}
+
 	return nil
 }