Skip to content

Commit

Permalink
fix unnecessary warnings in allow_object_disk_streaming: true behav…
Browse files Browse the repository at this point in the history
…ior during restore
  • Loading branch information
Slach committed Aug 30, 2024
1 parent b7faa4a commit 271a5b4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/backup/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
Expand All @@ -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
Expand Down

0 comments on commit 271a5b4

Please sign in to comment.