|
|
@ -911,7 +911,7 @@ func (z *erasureZones) listObjects(ctx context.Context, bucket, prefix, marker, |
|
|
|
entryChs, endWalkCh := zone.pool.Release(listParams{bucket, recursive, marker, prefix}) |
|
|
|
entryChs, endWalkCh := zone.pool.Release(listParams{bucket, recursive, marker, prefix}) |
|
|
|
if entryChs == nil { |
|
|
|
if entryChs == nil { |
|
|
|
endWalkCh = make(chan struct{}) |
|
|
|
endWalkCh = make(chan struct{}) |
|
|
|
entryChs = zone.startMergeWalksN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.listTolerancePerSet, false) |
|
|
|
entryChs = zone.startMergeWalksN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.listTolerancePerSet+1, false) |
|
|
|
} |
|
|
|
} |
|
|
|
zonesEntryChs = append(zonesEntryChs, entryChs) |
|
|
|
zonesEntryChs = append(zonesEntryChs, entryChs) |
|
|
|
zonesEndWalkCh = append(zonesEndWalkCh, endWalkCh) |
|
|
|
zonesEndWalkCh = append(zonesEndWalkCh, endWalkCh) |
|
|
@ -1280,7 +1280,7 @@ func (z *erasureZones) listObjectVersions(ctx context.Context, bucket, prefix, m |
|
|
|
entryChs, endWalkCh := zone.poolVersions.Release(listParams{bucket, recursive, marker, prefix}) |
|
|
|
entryChs, endWalkCh := zone.poolVersions.Release(listParams{bucket, recursive, marker, prefix}) |
|
|
|
if entryChs == nil { |
|
|
|
if entryChs == nil { |
|
|
|
endWalkCh = make(chan struct{}) |
|
|
|
endWalkCh = make(chan struct{}) |
|
|
|
entryChs = zone.startMergeWalksVersionsN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.listTolerancePerSet) |
|
|
|
entryChs = zone.startMergeWalksVersionsN(ctx, bucket, prefix, marker, recursive, endWalkCh, zone.listTolerancePerSet+1) |
|
|
|
} |
|
|
|
} |
|
|
|
zonesEntryChs = append(zonesEntryChs, entryChs) |
|
|
|
zonesEntryChs = append(zonesEntryChs, entryChs) |
|
|
|
zonesEndWalkCh = append(zonesEndWalkCh, endWalkCh) |
|
|
|
zonesEndWalkCh = append(zonesEndWalkCh, endWalkCh) |
|
|
|