MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-20 01:50:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move all List calls to honor new maxObjectList limit (#8459)

Browse Source
This commit is contained in:
Harshavardhana
2019-10-30 13:20:01 -07:00
committed by kannappanr
parent 8cc5ecec23
commit 599aae5ba6
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/web-handlers.go
View File

@@ -418,7 +418,8 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
nextMarker := ""
// Fetch all the objects
for {
result, err := core.ListObjects(args.BucketName, args.Prefix, nextMarker, SlashSeparator, 1000)
result, err := core.ListObjects(args.BucketName, args.Prefix, nextMarker, SlashSeparator,
maxObjectList)
if err != nil {
return toJSONError(ctx, err, args.BucketName)
}
@@ -532,7 +533,7 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
nextMarker := ""
// Fetch all the objects
for {
lo, err := listObjects(ctx, args.BucketName, args.Prefix, nextMarker, SlashSeparator, 1000)
lo, err := listObjects(ctx, args.BucketName, args.Prefix, nextMarker, SlashSeparator, maxObjectList)
if err != nil {
return &json2.Error{Message: err.Error()}
}
@@ -711,7 +712,7 @@ next:
marker := ""
for {
var lo ListObjectsInfo
lo, err = listObjects(ctx, args.BucketName, objectName, marker, "", 1000)
lo, err = listObjects(ctx, args.BucketName, objectName, marker, "", maxObjectList)
if err != nil {
break next
}
@@ -1363,7 +1364,8 @@ func (web *webAPIHandlers) DownloadZip(w http.ResponseWriter, r *http.Request) {
// date to the response writer.
marker := ""
for {
lo, err := listObjects(ctx, args.BucketName, pathJoin(args.Prefix, object), marker, "", 1000)
lo, err := listObjects(ctx, args.BucketName, pathJoin(args.Prefix, object), marker, "",
maxObjectList)
if err != nil {
return
}