gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

s3: recursively iterate all sub folders

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1656
This commit is contained in:
Chris Lu 2020-12-09 16:47:34 -08:00
parent a9c619c270
commit 02a160c3fd
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
weed/s3api/s3api_objects_list_handlers.go
View file

@ -197,11 +197,12 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d
sepIndex := strings.Index(marker, "/") sepIndex := strings.Index(marker, "/")
subDir, subMarker := marker[0:sepIndex], marker[sepIndex+1:] subDir, subMarker := marker[0:sepIndex], marker[sepIndex+1:]
// println("doListFilerEntries dir", dir+"/"+subDir, "subMarker", subMarker, "maxKeys", maxKeys) // println("doListFilerEntries dir", dir+"/"+subDir, "subMarker", subMarker, "maxKeys", maxKeys)
subCounter, _, subNextMarker, subErr := s3a.doListFilerEntries(client, dir+"/"+subDir, "", maxKeys, subMarker, delimiter, eachEntryFn) subCounter, subIsTruncated, subNextMarker, subErr := s3a.doListFilerEntries(client, dir+"/"+subDir, "", maxKeys, subMarker, delimiter, eachEntryFn)
if subErr != nil { if subErr != nil {
err = subErr err = subErr
return return
} }
isTruncated = isTruncated || subIsTruncated
maxKeys -= subCounter maxKeys -= subCounter
nextMarker = subDir + "/" + subNextMarker nextMarker = subDir + "/" + subNextMarker
counter += subCounter counter += subCounter