|
|
@ -20,8 +20,6 @@ import ( |
|
|
|
"context" |
|
|
|
"context" |
|
|
|
"sort" |
|
|
|
"sort" |
|
|
|
"strings" |
|
|
|
"strings" |
|
|
|
|
|
|
|
|
|
|
|
"github.com/minio/minio/cmd/logger" |
|
|
|
|
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
// Tree walk result carries results of tree walking.
|
|
|
|
// Tree walk result carries results of tree walking.
|
|
|
@ -147,7 +145,6 @@ func doTreeWalk(ctx context.Context, bucket, prefixDir, entryPrefixMatch, marker |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
select { |
|
|
|
select { |
|
|
|
case <-endWalkCh: |
|
|
|
case <-endWalkCh: |
|
|
|
logger.LogIf(ctx, errWalkAbort) |
|
|
|
|
|
|
|
return errWalkAbort |
|
|
|
return errWalkAbort |
|
|
|
case resultCh <- treeWalkResult{err: err}: |
|
|
|
case resultCh <- treeWalkResult{err: err}: |
|
|
|
return err |
|
|
|
return err |
|
|
@ -229,7 +226,6 @@ func doTreeWalk(ctx context.Context, bucket, prefixDir, entryPrefixMatch, marker |
|
|
|
isEOF := ((i == len(entries)-1) && isEnd) |
|
|
|
isEOF := ((i == len(entries)-1) && isEnd) |
|
|
|
select { |
|
|
|
select { |
|
|
|
case <-endWalkCh: |
|
|
|
case <-endWalkCh: |
|
|
|
logger.LogIf(ctx, errWalkAbort) |
|
|
|
|
|
|
|
return errWalkAbort |
|
|
|
return errWalkAbort |
|
|
|
case resultCh <- treeWalkResult{entry: pathJoin(prefixDir, entry), end: isEOF}: |
|
|
|
case resultCh <- treeWalkResult{entry: pathJoin(prefixDir, entry), end: isEOF}: |
|
|
|
} |
|
|
|
} |
|
|
|