|
@ -310,6 +310,8 @@ func getListObjectsV1Args(values url.Values) (prefix, marker, delimiter string, |
|
|
|
|
|
|
|
|
func (s3a *S3ApiServer) isDirectoryAllEmpty(filerClient filer_pb.SeaweedFilerClient, parentDir, name string) (isEmpty bool, err error) { |
|
|
func (s3a *S3ApiServer) isDirectoryAllEmpty(filerClient filer_pb.SeaweedFilerClient, parentDir, name string) (isEmpty bool, err error) { |
|
|
// println("+ isDirectoryAllEmpty", dir, name)
|
|
|
// println("+ isDirectoryAllEmpty", dir, name)
|
|
|
|
|
|
glog.V(4).Infof("+ start parentDir: %s name: %s", parentDir, name) |
|
|
|
|
|
defer glog.V(4).Infof("- start parentDir: %s name: %s isEmpty: %v", parentDir, name, isEmpty) |
|
|
var fileCounter int |
|
|
var fileCounter int |
|
|
var subDirs []string |
|
|
var subDirs []string |
|
|
currentDir := parentDir + "/" + name |
|
|
currentDir := parentDir + "/" + name |
|
@ -324,6 +326,7 @@ func (s3a *S3ApiServer) isDirectoryAllEmpty(filerClient filer_pb.SeaweedFilerCli |
|
|
} |
|
|
} |
|
|
startFrom = entry.Name |
|
|
startFrom = entry.Name |
|
|
isExhausted = isExhausted || isLast |
|
|
isExhausted = isExhausted || isLast |
|
|
|
|
|
glog.V(4).Infof("list: %s/%s isExhausted: %t", currentDir, startFrom, isExhausted) |
|
|
return nil |
|
|
return nil |
|
|
}, startFrom, false, 8) |
|
|
}, startFrom, false, 8) |
|
|
} |
|
|
} |
|
|