aboutsummaryrefslogtreecommitdiff
path: root/weed/shell/command_fs_configure.go
diff options
context:
space:
mode:
authorKonstantin Lebedev <lebedev_k@tochka.com>2021-10-11 15:03:56 +0500
committerKonstantin Lebedev <lebedev_k@tochka.com>2021-10-11 15:03:56 +0500
commitbe4b3ed509178b6464452cd91fb06718548f9307 (patch)
treef298ec711c279cbb64b9c438bb84d1238feb1ba9 /weed/shell/command_fs_configure.go
parent84d2e1bdd099550aaba494c88324c8c0dbc08776 (diff)
downloadseaweedfs-be4b3ed509178b6464452cd91fb06718548f9307.tar.xz
seaweedfs-be4b3ed509178b6464452cd91fb06718548f9307.zip
AclHandlers
Diffstat (limited to 'weed/shell/command_fs_configure.go')
-rw-r--r--weed/shell/command_fs_configure.go19
1 files changed, 1 insertions, 18 deletions
diff --git a/weed/shell/command_fs_configure.go b/weed/shell/command_fs_configure.go
index 0aae51d74..25761d580 100644
--- a/weed/shell/command_fs_configure.go
+++ b/weed/shell/command_fs_configure.go
@@ -62,7 +62,7 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io
return nil
}
- fc, err := readFilerConf(commandEnv)
+ fc, err := filer.ReadFilerConf(commandEnv.option.FilerAddress, commandEnv.option.GrpcDialOption, commandEnv.MasterClient)
if err != nil {
return err
}
@@ -122,20 +122,3 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io
return nil
}
-
-func readFilerConf(commandEnv *CommandEnv) (*filer.FilerConf, error) {
- var buf bytes.Buffer
- if err := commandEnv.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {
- return filer.ReadEntry(commandEnv.MasterClient, client, filer.DirectoryEtcSeaweedFS, filer.FilerConfName, &buf)
- }); err != nil && err != filer_pb.ErrNotFound {
- return nil, fmt.Errorf("read %s/%s: %v", filer.DirectoryEtcSeaweedFS, filer.FilerConfName, err)
- }
-
- fc := filer.NewFilerConf()
- if buf.Len() > 0 {
- if err := fc.LoadFromBytes(buf.Bytes()); err != nil {
- return nil, fmt.Errorf("parse %s/%s: %v", filer.DirectoryEtcSeaweedFS, filer.FilerConfName, err)
- }
- }
- return fc, nil
-}