lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-22 04:37:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Chris Lu
2021-07-27 03:32:24 -07:00
parent 1752eeb538
commit 035b0bae29
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
weed/remote_storage/s3/s3_storage_client.go
View File

@@ -47,6 +47,7 @@ type s3RemoteStorageClient struct {
func (s s3RemoteStorageClient) Traverse(remote remote_storage.RemoteStorageLocation, visitFn remote_storage.VisitFunc) (err error) { func (s s3RemoteStorageClient) Traverse(remote remote_storage.RemoteStorageLocation, visitFn remote_storage.VisitFunc) (err error) {
_, bucket, pathKey := remote.NameBucketPath() _, bucket, pathKey := remote.NameBucketPath()
pathKey = pathKey[1:]
listInput := &s3.ListObjectsV2Input{ listInput := &s3.ListObjectsV2Input{
Bucket: aws.String(bucket), Bucket: aws.String(bucket),
@@ -56,7 +57,7 @@ func (s s3RemoteStorageClient) Traverse(remote remote_storage.RemoteStorageLocat
ExpectedBucketOwner: nil, ExpectedBucketOwner: nil,
FetchOwner: nil, FetchOwner: nil,
MaxKeys: nil, // aws.Int64(1000), MaxKeys: nil, // aws.Int64(1000),
Prefix: aws.String(pathKey[1:]), Prefix: aws.String(pathKey),
RequestPayer: nil, RequestPayer: nil,
StartAfter: nil, StartAfter: nil,
} }
@@ -65,10 +66,10 @@ func (s s3RemoteStorageClient) Traverse(remote remote_storage.RemoteStorageLocat
listErr := s.conn.ListObjectsV2Pages(listInput, func(page *s3.ListObjectsV2Output, lastPage bool) bool { listErr := s.conn.ListObjectsV2Pages(listInput, func(page *s3.ListObjectsV2Output, lastPage bool) bool {
for _, content := range page.Contents { for _, content := range page.Contents {
key := (*content.Key) key := (*content.Key)
if len(pathKey) == 1 { if len(pathKey) == 0 {
key = "/" + key key = "/" + key
} else { } else {
key = key[len(pathKey)-1:] key = key[len(pathKey):]
} }
dir, name := util.FullPath(key).DirAndName() dir, name := util.FullPath(key).DirAndName()
if err := visitFn(dir, name, false, &filer_pb.RemoteEntry{ if err := visitFn(dir, name, false, &filer_pb.RemoteEntry{