Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

rename

pull/2321/head
Chris Lu 3 years ago
parent
c3db389e42
commit
df29281536
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      weed/filer/remote_mapping.go
  2. 2
      weed/shell/command_remote_mount.go

10
weed/filer/remote_mapping.go
View File

@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )
func SaveMountMapping(filerClient filer_pb.FilerClient, dir string, remoteStorageLocation *remote_pb.RemoteStorageLocation) (err error) {
func InsertMountMapping(filerClient filer_pb.FilerClient, dir string, remoteStorageLocation *remote_pb.RemoteStorageLocation) (err error) {
// read current mapping // read current mapping
var oldContent, newContent []byte var oldContent, newContent []byte
@ -22,7 +22,7 @@ func SaveMountMapping(filerClient filer_pb.FilerClient, dir string, remoteStorag
} }
// add new mapping // add new mapping
newContent, err = AddRemoteStorageMapping(oldContent, dir, remoteStorageLocation)
newContent, err = addRemoteStorageMapping(oldContent, dir, remoteStorageLocation)
if err != nil { if err != nil {
return fmt.Errorf("add mapping %s~%s: %v", dir, remoteStorageLocation, err) return fmt.Errorf("add mapping %s~%s: %v", dir, remoteStorageLocation, err)
} }
@ -53,7 +53,7 @@ func DeleteMountMapping(filerClient filer_pb.FilerClient, dir string) (err error
} }
// add new mapping // add new mapping
newContent, err = RemoveRemoteStorageMapping(oldContent, dir)
newContent, err = removeRemoteStorageMapping(oldContent, dir)
if err != nil { if err != nil {
return fmt.Errorf("delete mount %s: %v", dir, err) return fmt.Errorf("delete mount %s: %v", dir, err)
} }
@ -69,7 +69,7 @@ func DeleteMountMapping(filerClient filer_pb.FilerClient, dir string) (err error
return nil return nil
} }
func AddRemoteStorageMapping(oldContent []byte, dir string, storageLocation *remote_pb.RemoteStorageLocation) (newContent []byte, err error) {
func addRemoteStorageMapping(oldContent []byte, dir string, storageLocation *remote_pb.RemoteStorageLocation) (newContent []byte, err error) {
mappings, unmarshalErr := UnmarshalRemoteStorageMappings(oldContent) mappings, unmarshalErr := UnmarshalRemoteStorageMappings(oldContent)
if unmarshalErr != nil { if unmarshalErr != nil {
// skip // skip
@ -85,7 +85,7 @@ func AddRemoteStorageMapping(oldContent []byte, dir string, storageLocation *rem
return return
} }
func RemoveRemoteStorageMapping(oldContent []byte, dir string) (newContent []byte, err error) {
func removeRemoteStorageMapping(oldContent []byte, dir string) (newContent []byte, err error) {
mappings, unmarshalErr := UnmarshalRemoteStorageMappings(oldContent) mappings, unmarshalErr := UnmarshalRemoteStorageMappings(oldContent)
if unmarshalErr != nil { if unmarshalErr != nil {
return nil, unmarshalErr return nil, unmarshalErr

2
weed/shell/command_remote_mount.go
View File

@ -79,7 +79,7 @@ func (c *commandRemoteMount) Do(args []string, commandEnv *CommandEnv, writer io
} }
// store a mount configuration in filer // store a mount configuration in filer
if err = filer.SaveMountMapping(commandEnv, *dir, remoteStorageLocation); err != nil {
if err = filer.InsertMountMapping(commandEnv, *dir, remoteStorageLocation); err != nil {
return fmt.Errorf("save mount mapping: %v", err) return fmt.Errorf("save mount mapping: %v", err)
} }

Write Preview
Loading…
Cancel
Save