diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-08-04 00:31:06 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-08-04 00:31:06 -0700 |
| commit | f6a9ad8001c439e5751fa5488fe6106b185ba8eb (patch) | |
| tree | 6db2fe45f36a10fc400cdd9c2be3fbd49a63360d | |
| parent | 42969c9c6247117f99ece43194912cd098acceb0 (diff) | |
| download | seaweedfs-f6a9ad8001c439e5751fa5488fe6106b185ba8eb.tar.xz seaweedfs-f6a9ad8001c439e5751fa5488fe6106b185ba8eb.zip | |
fix tests
| -rw-r--r-- | weed/filer/filer_remote_storage.go | 11 | ||||
| -rw-r--r-- | weed/filer/filer_remote_storage_test.go | 6 | ||||
| -rw-r--r-- | weed/shell/command_remote_mount.go | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/weed/filer/filer_remote_storage.go b/weed/filer/filer_remote_storage.go index 0967de1a6..a859ad34b 100644 --- a/weed/filer/filer_remote_storage.go +++ b/weed/filer/filer_remote_storage.go @@ -87,19 +87,18 @@ func (rs *FilerRemoteStorage) FindMountDirectory(p util.FullPath) (mountDir util } func (rs *FilerRemoteStorage) FindRemoteStorageClient(p util.FullPath) (client remote_storage.RemoteStorageClient, remoteConf *filer_pb.RemoteConf, found bool) { - var storageLocation string + var storageLocation *filer_pb.RemoteStorageLocation rs.rules.MatchPrefix([]byte(p), func(key []byte, value interface{}) bool { - storageLocation = value.(string) + storageLocation = value.(*filer_pb.RemoteStorageLocation) return true }) - if storageLocation == "" { + if storageLocation == nil { + found = false return } - loc := remote_storage.ParseLocation(storageLocation) - - return rs.GetRemoteStorageClient(loc.Name) + return rs.GetRemoteStorageClient(storageLocation.Name) } func (rs *FilerRemoteStorage) GetRemoteStorageClient(storageName string) (client remote_storage.RemoteStorageClient, remoteConf *filer_pb.RemoteConf, found bool) { diff --git a/weed/filer/filer_remote_storage_test.go b/weed/filer/filer_remote_storage_test.go index e5996475e..427cd5a8a 100644 --- a/weed/filer/filer_remote_storage_test.go +++ b/weed/filer/filer_remote_storage_test.go @@ -14,7 +14,11 @@ func TestFilerRemoteStorage_FindRemoteStorageClient(t *testing.T) { rs := NewFilerRemoteStorage() rs.storageNameToConf[conf.Name] = conf - rs.mapDirectoryToRemoteStorage("/a/b/c", "s7") + rs.mapDirectoryToRemoteStorage("/a/b/c", &filer_pb.RemoteStorageLocation{ + Name: "s7", + Bucket: "some", + Path: "/dir", + }) _, _, found := rs.FindRemoteStorageClient("/a/b/c/d/e/f") assert.Equal(t, true, found, "find storage client") diff --git a/weed/shell/command_remote_mount.go b/weed/shell/command_remote_mount.go index bd6b49050..55dfb42ca 100644 --- a/weed/shell/command_remote_mount.go +++ b/weed/shell/command_remote_mount.go @@ -130,17 +130,15 @@ func (c *commandRemoteMount) findRemoteStorageConfiguration(commandEnv *CommandE func (c *commandRemoteMount) pullMetadata(commandEnv *CommandEnv, writer io.Writer, dir string, nonEmpty bool, remoteConf *filer_pb.RemoteConf, remote *filer_pb.RemoteStorageLocation) error { // find existing directory, and ensure the directory is empty - var mountToDir *filer_pb.Entry err := commandEnv.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error { parent, name := util.FullPath(dir).DirAndName() - resp, lookupErr := client.LookupDirectoryEntry(context.Background(), &filer_pb.LookupDirectoryEntryRequest{ + _, lookupErr := client.LookupDirectoryEntry(context.Background(), &filer_pb.LookupDirectoryEntryRequest{ Directory: parent, Name: name, }) if lookupErr != nil { return fmt.Errorf("lookup %s: %v", dir, lookupErr) } - mountToDir = resp.Entry mountToDirIsEmpty := true listErr := filer_pb.SeaweedList(client, dir, "", func(entry *filer_pb.Entry, isLast bool) error { |