MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-31 17:53:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

XL/Incompleteuploads: list should save the tree-walk go routine to the map if eof is not reached. (#1695)

Browse Source
This commit is contained in:
Krishna Srinivas 2016-05-21 00:39:21 +05:30 committed by Harshavardhana
parent 5b95f097d4
commit b83b87a7f6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
object-common-multipart.go
View File

@ -357,6 +357,7 @@ func listMetaBucketMultipartFiles(layer ObjectLayer, prefixPath string, markerPa
// Following loop gathers and filters out special files inside // Following loop gathers and filters out special files inside
// minio meta volume. // minio meta volume.
outerLoop:
for { for {
walkResult, ok := <-walker.ch walkResult, ok := <-walker.ch
if !ok { if !ok {
@ -397,9 +398,9 @@ func listMetaBucketMultipartFiles(layer ObjectLayer, prefixPath string, markerPa
fileInfos = append(fileInfos, fileInfo) fileInfos = append(fileInfos, fileInfo)
newMaxKeys++ newMaxKeys++
// If we have reached the maxKeys, it means we have listed // If we have reached the maxKeys, it means we have listed
// everything that was requested. Return right here. // everything that was requested.
if newMaxKeys == maxKeys { if newMaxKeys == maxKeys {
return break outerLoop
} }
} }
} else { } else {
@ -415,13 +416,20 @@ func listMetaBucketMultipartFiles(layer ObjectLayer, prefixPath string, markerPa
fileInfos = append(fileInfos, fi) fileInfos = append(fileInfos, fi)
newMaxKeys++ newMaxKeys++
// If we have reached the maxKeys, it means we have listed // If we have reached the maxKeys, it means we have listed
// everything that was requested. Return right here. // everything that was requested.
if newMaxKeys == maxKeys { if newMaxKeys == maxKeys {
return break
} }
} }
} }
if !eof && len(fileInfos) != 0 {
// EOF has not reached, hence save the walker channel to the map so that the walker go routine
// can continue from where it left off for the next list request.
lastFileInfo := fileInfos[len(fileInfos)-1]
markerPath = lastFileInfo.Name
saveTreeWalk(layer, listParams{minioMetaBucket, recursive, markerPath, prefixPath}, walker)
}
// Return entries here. // Return entries here.
return fileInfos, eof, nil return fileInfos, eof, nil
} }