Fix s3 driver for supporting ceph radosgw
Radosgw does not support S3 `GET Bucket` API v2 API but v1.
This API has backward compatibility, so most of this API is working
correctly but we can not get `KeyCount` in v1 API and which is only
for v2 API.
@@ -970,8 +970,16 @@ 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 {
+ var count int64
+ if objects.KeyCount != nil {
+ count = *objects.KeyCount
*objectCount += *objects.KeyCount
- walkInfos := make([]walkInfoContainer, 0, *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
