|
|
|
@ -646,7 +646,7 @@ func (z *erasureZones) listObjectsNonSlash(ctx context.Context, bucket, prefix, |
|
|
|
|
|
|
|
|
|
for _, zone := range z.zones { |
|
|
|
|
zonesEntryChs = append(zonesEntryChs, |
|
|
|
|
zone.startMergeWalksN(ctx, bucket, prefix, "", true, endWalkCh, zone.listTolerancePerSet, false)) |
|
|
|
|
zone.startMergeWalksN(ctx, bucket, prefix, "", true, endWalkCh, zone.setDriveCount, false)) |
|
|
|
|
zonesListTolerancePerSet = append(zonesListTolerancePerSet, zone.listTolerancePerSet) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -765,7 +765,7 @@ func (z *erasureZones) listObjectsSplunk(ctx context.Context, bucket, prefix, ma |
|
|
|
|
entryChs, endWalkCh := zone.poolSplunk.Release(listParams{bucket, recursive, marker, prefix}) |
|
|
|
|
if entryChs == nil { |
|
|
|
|
endWalkCh = make(chan struct{}) |
|
|
|
|
entryChs = zone.startMergeWalksN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.listTolerancePerSet, true) |
|
|
|
|
entryChs = zone.startMergeWalksN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.setDriveCount, true) |
|
|
|
|
} |
|
|
|
|
zonesEntryChs = append(zonesEntryChs, entryChs) |
|
|
|
|
zonesEndWalkCh = append(zonesEndWalkCh, endWalkCh) |
|
|
|
@ -857,7 +857,7 @@ func (z *erasureZones) listObjects(ctx context.Context, bucket, prefix, marker, |
|
|
|
|
entryChs, endWalkCh := zone.pool.Release(listParams{bucket, recursive, marker, prefix}) |
|
|
|
|
if entryChs == nil { |
|
|
|
|
endWalkCh = make(chan struct{}) |
|
|
|
|
entryChs = zone.startMergeWalksN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.listTolerancePerSet+1, false) |
|
|
|
|
entryChs = zone.startMergeWalksN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.setDriveCount, false) |
|
|
|
|
} |
|
|
|
|
zonesEntryChs = append(zonesEntryChs, entryChs) |
|
|
|
|
zonesEndWalkCh = append(zonesEndWalkCh, endWalkCh) |
|
|
|
@ -1226,7 +1226,7 @@ func (z *erasureZones) listObjectVersions(ctx context.Context, bucket, prefix, m |
|
|
|
|
entryChs, endWalkCh := zone.poolVersions.Release(listParams{bucket, recursive, marker, prefix}) |
|
|
|
|
if entryChs == nil { |
|
|
|
|
endWalkCh = make(chan struct{}) |
|
|
|
|
entryChs = zone.startMergeWalksVersionsN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.listTolerancePerSet+1) |
|
|
|
|
entryChs = zone.startMergeWalksVersionsN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.setDriveCount) |
|
|
|
|
} |
|
|
|
|
zonesEntryChs = append(zonesEntryChs, entryChs) |
|
|
|
|
zonesEndWalkCh = append(zonesEndWalkCh, endWalkCh) |
|
|
|
|