Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/2.7] Fix s3 driver for supporting ceph radosgw #3119

Merged
merged 2 commits into from Mar 11, 2020
Merged

[release/2.7] Fix s3 driver for supporting ceph radosgw #3119

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a1e4a5
Fix s3 driver for supporting ceph radosgw
leoh0 Apr 25, 2018
e2f006a
S3 Driver: added comment for missing KeyCount workaround
tbe Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions registry/storage/driver/s3-aws/s3.go
View file
Open in desktop
Expand Up @@ -970,8 +970,19 @@ func (d *driver) doWalk(parentCtx context.Context, objectCount *int64, path, pre
defer done("s3aws.ListObjectsV2Pages(%s)", path)
listObjectErr := d.S3.ListObjectsV2PagesWithContext(ctx, listObjectsInput, func(objects *s3.ListObjectsV2Output, lastPage bool) bool {

*objectCount += *objects.KeyCount
walkInfos := make([]walkInfoContainer, 0, *objects.KeyCount)
var count int64
// KeyCount was introduced with version 2 of the GET Bucket operation in S3.
// Some S3 implementations don't support V2 now, so we fall back to manual
// calculation of the key count if required
if objects.KeyCount != nil {
count = *objects.KeyCount
*objectCount += *objects.KeyCount
} else {
count = int64(len(objects.Contents) + len(objects.CommonPrefixes))
*objectCount += count
}

walkInfos := make([]walkInfoContainer, 0, count)

for _, dir := range objects.CommonPrefixes {
commonPrefix := *dir.Prefix
Expand Down