skip ValidateObjectDiskConfig for --diff-from-remote when object …

…disk doesn't contains data fix #910
Altinity · May 3, 2024 · 0f7f292 · 0f7f292
1 parent bc2ee3b
commit 0f7f292
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.5.6
+BUG FIXES
+- skip `ValidateObjectDiskConfig` for `--diff-from-remote` when object disk doesn't contains data fix [910](https://github.com/Altinity/clickhouse-backup/issues/910)
+
 # v2.5.5
 IMPROVEMENTS
 - added `object_disk_server_side_copy_concurrency` with default value `32`, to avoid slow `create` or `restore` backup process which was restricted by `upload_concurrency` or `download_concurrency` options, fix [903](https://github.com/Altinity/clickhouse-backup/issues/903)

diff --git a/pkg/backup/create.go b/pkg/backup/create.go
@@ -216,16 +216,21 @@ func (b *Backuper) createBackupLocal(ctx context.Context, backupName, diffFromRe
 			}
 		}
 	}
-	if isObjectDiskContainsTables || (diffFromRemote != "" && b.cfg.General.RemoteStorage != "custom") {
-		var err error
+
+	var err error
+	// https://github.com/Altinity/clickhouse-backup/issues/910
+	if isObjectDiskContainsTables {
 		if err = config.ValidateObjectDiskConfig(b.cfg); err != nil {
 			return err
 		}
+	}
+
+	if isObjectDiskContainsTables || (diffFromRemote != "" && b.cfg.General.RemoteStorage != "custom") {
 		b.dst, err = storage.NewBackupDestination(ctx, b.cfg, b.ch, false, backupName)
 		if err != nil {
 			return err
 		}
-		if err := b.dst.Connect(ctx); err != nil {
+		if err = b.dst.Connect(ctx); err != nil {
 			return fmt.Errorf("can't connect to %s: %v", b.dst.Kind(), err)
 		}
 		defer func() {