github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-08-21 00:04:10 +00:00
Code Issues Projects Releases Wiki Activity

storagedriver/s3: fixed a bug in s3 Walk impl preventing ErrSkipDir from stopping gracefully

Browse Source
This commit is contained in:
Collin Shoop 2021-06-28 13:16:33 -04:00
parent aea873cc92
commit 847738fd5e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
registry/storage/driver/s3-aws/s3.go
View File

@ -1122,6 +1122,7 @@ func (d *driver) doWalk(parentCtx context.Context, objectCount *int64, path, pre
continue continue
} }
// walk over file's parent directory if not a duplicate
dir := filepath.Dir(walkInfo.Path()) dir := filepath.Dir(walkInfo.Path())
if dir != prevDir { if dir != prevDir {
prevDir = dir prevDir = dir
@ -1149,7 +1150,8 @@ func (d *driver) doWalk(parentCtx context.Context, objectCount *int64, path, pre
if err != nil { if err != nil {
if err == storagedriver.ErrSkipDir { if err == storagedriver.ErrSkipDir {
break // stop early without return error
return false
} }
retError = err retError = err
return false return false