From 271a5b4120f08089379aa5040a635782610cd9bf Mon Sep 17 00:00:00 2001 From: Slach Date: Fri, 30 Aug 2024 11:14:54 +0500 Subject: [PATCH 1/2] fix unnecessary warnings in `allow_object_disk_streaming: true` behavior during restore --- ChangeLog.md | 4 ++++ pkg/backup/restore.go | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9a6cf4d6..777d1aa5 100644 --- 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 index 48d22956..817b68bf 100644 --- 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 From 0656ddb1ca4ed76a8b82e40863edec5ad9a906e5 Mon Sep 17 00:00:00 2001 From: Slach Date: Thu, 5 Sep 2024 16:41:50 +0400 Subject: [PATCH 2/2] tune clickhouse healthcheck --- test/integration/docker-compose.yml | 6 +++--- test/integration/docker-compose_advanced.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml index 7f6550bc..87dd4e56 100644 --- 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 index a433f594..163b5098 100644 --- a/test/integration/docker-compose_advanced.yml +++ b/test/integration/docker-compose_advanced.yml @@ -295,9 +295,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