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

try fix s3test test_bucket_listv2_delimiter_prefix (#4396)

Browse source
This commit is contained in:
Konstantin Lebedev 2023-04-12 20:47:20 +05:00 committed by GitHub
parent 095cdb0c7f
commit 88b2bbadd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
weed/s3api/s3api_objects_list_handlers.go
View file

@ -353,7 +353,9 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d
nextMarker = entry.Name nextMarker = entry.Name
if cursor.prefixEndsOnDelimiter { if cursor.prefixEndsOnDelimiter {
if entry.Name == prefix && entry.IsDirectory { if entry.Name == prefix && entry.IsDirectory {
cursor.prefixEndsOnDelimiter = false if delimiter != "/" {
cursor.prefixEndsOnDelimiter = false
}
} else { } else {
continue continue
} }
@ -363,8 +365,12 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d
if entry.Name == s3_constants.MultipartUploadsFolder { // FIXME no need to apply to all directories. this extra also affects maxKeys if entry.Name == s3_constants.MultipartUploadsFolder { // FIXME no need to apply to all directories. this extra also affects maxKeys
continue continue
} }
if delimiter != "/" { if delimiter != "/" || cursor.prefixEndsOnDelimiter {
eachEntryFn(dir, entry) if cursor.prefixEndsOnDelimiter {
cursor.prefixEndsOnDelimiter = false
} else {
eachEntryFn(dir, entry)
}
subNextMarker, subErr := s3a.doListFilerEntries(client, dir+"/"+entry.Name, "", cursor, "", delimiter, false, eachEntryFn) subNextMarker, subErr := s3a.doListFilerEntries(client, dir+"/"+entry.Name, "", cursor, "", delimiter, false, eachEntryFn)
if subErr != nil { if subErr != nil {
err = fmt.Errorf("doListFilerEntries2: %v", subErr) err = fmt.Errorf("doListFilerEntries2: %v", subErr)
@ -391,6 +397,9 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d
eachEntryFn(dir, entry) eachEntryFn(dir, entry)
// glog.V(4).Infof("List File Entries %s, file: %s, maxKeys %d", dir, entry.Name, cursor.maxKeys) // glog.V(4).Infof("List File Entries %s, file: %s, maxKeys %d", dir, entry.Name, cursor.maxKeys)
} }
if cursor.prefixEndsOnDelimiter {
cursor.prefixEndsOnDelimiter = false
}
} }
return return
} }