aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2023-12-13 11:38:34 -0800
committerchrislu <chris.lu@gmail.com>2023-12-13 11:38:34 -0800
commit1397b1ca09942da0a26c42444fc4a3eff316d4d7 (patch)
tree6165595b2e299241af102bdaed7baa1f31af70db
parent97c26ac5eb01c121d561a53c15f2fcd3b14991e4 (diff)
parentd5c01e5ceb91c8ebd97e957376488d03c4867836 (diff)
downloadseaweedfs-1397b1ca09942da0a26c42444fc4a3eff316d4d7.tar.xz
seaweedfs-1397b1ca09942da0a26c42444fc4a3eff316d4d7.zip
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
-rw-r--r--weed/filer/remote_mapping.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/weed/filer/remote_mapping.go b/weed/filer/remote_mapping.go
index 8a7bea3d6..c8adbeb4d 100644
--- a/weed/filer/remote_mapping.go
+++ b/weed/filer/remote_mapping.go
@@ -15,9 +15,11 @@ func ReadMountMappings(grpcDialOption grpc.DialOption, filerAddress pb.ServerAdd
oldContent, readErr = ReadInsideFiler(client, DirectoryEtcRemote, REMOTE_STORAGE_MOUNT_FILE)
return readErr
}); readErr != nil {
- return nil, readErr
+ if readErr != filer_pb.ErrNotFound {
+ return nil, fmt.Errorf("read existing mapping: %v", readErr)
+ }
+ oldContent = nil
}
-
mappings, readErr = UnmarshalRemoteStorageMappings(oldContent)
if readErr != nil {
return nil, fmt.Errorf("unmarshal mappings: %v", readErr)