Merge branch 'master' into deutsch/example_docker_args

Altinity · Sep 5, 2024 · 6cbb77b · 6cbb77b
2 parents b1eb75b + c39d47f
commit 6cbb77b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.6.1 (not released yet)
+BUG FIXES
+- fix unnecessary warnings in `allow_object_disk_streaming: true` behavior during restore
+
 # v2.6.0
 IMPROVEMENTS
 - add `rbac-only` and `configs-only` parameters to `POST /backup/create` and `POST /backup/restore` API calls

diff --git a/pkg/backup/restore.go b/pkg/backup/restore.go
@@ -1398,6 +1398,8 @@ func (b *Backuper) downloadObjectDiskParts(ctx context.Context, backupName strin
 			start := time.Now()
 			downloadObjectDiskPartsWorkingGroup, downloadCtx := errgroup.WithContext(ctx)
 			downloadObjectDiskPartsWorkingGroup.SetLimit(int(b.cfg.General.ObjectDiskServerSideCopyConcurrency))
+			var isCopyFailed atomic.Bool
+			isCopyFailed.Store(false)
 			for _, part := range parts {
 				dstDiskName := diskName
 				if part.RebalancedDisk != "" {
@@ -1414,8 +1416,6 @@ func (b *Backuper) downloadObjectDiskParts(ctx context.Context, backupName strin
 						return 0, findRecursiveErr
 					}
 				}
-				var isCopyFailed atomic.Bool
-				isCopyFailed.Store(false)
 				walkErr := filepath.Walk(partPath, func(fPath string, fInfo fs.FileInfo, err error) error {
 					if err != nil {
 						return err

diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml
@@ -235,9 +235,9 @@ services:
     healthcheck:
       test: clickhouse client -q "SELECT 1"
       interval: 1s
-      timeout: 2s
-      retries: 60
-      start_period: 1s
+      timeout: 5s
+      retries: 90
+      start_period: 2s
     depends_on:
       zookeeper:
         condition: service_healthy

diff --git a/test/integration/docker-compose_advanced.yml b/test/integration/docker-compose_advanced.yml
@@ -296,9 +296,9 @@ services:
     healthcheck:
       test: clickhouse client -q "SELECT 1"
       interval: 1s
-      timeout: 2s
-      retries: 60
-      start_period: 1s
+      timeout: 5s
+      retries: 90
+      start_period: 2s
     depends_on:
       mysql:
         condition: service_healthy