diff --git a/weed/shell/command_fs_meta_load.go b/weed/shell/command_fs_meta_load.go index f43574f49..c2e01dfc2 100644 --- a/weed/shell/command_fs_meta_load.go +++ b/weed/shell/command_fs_meta_load.go @@ -1,6 +1,7 @@ package shell import ( + "compress/gzip" "context" "flag" "fmt" @@ -60,11 +61,31 @@ func (c *commandFsMetaLoad) Do(args []string, commandEnv *CommandEnv, writer io. return nil } - dst, err := os.OpenFile(fileName, os.O_RDONLY, 0644) + var dst io.Reader + + f, err := os.OpenFile(fileName, os.O_RDONLY, 0644) if err != nil { - return nil + return fmt.Errorf("failed to open file %s: %v", fileName, err) + } + defer f.Close() + + dst = f + + if strings.HasSuffix(fileName, ".gz") || strings.HasSuffix(fileName, ".gzip") { + var gr *gzip.Reader + gr, err = gzip.NewReader(dst) + if err != nil { + return err + } + defer func() { + err1 := gr.Close() + if err == nil { + err = err1 + } + }() + + dst = gr } - defer dst.Close() var dirCount, fileCount uint64 lastLogTime := time.Now() diff --git a/weed/shell/command_fs_meta_save.go b/weed/shell/command_fs_meta_save.go index a8be9fe2c..ce982820d 100644 --- a/weed/shell/command_fs_meta_save.go +++ b/weed/shell/command_fs_meta_save.go @@ -1,9 +1,9 @@ package shell import ( + "compress/gzip" "flag" "fmt" - "github.com/seaweedfs/seaweedfs/weed/filer" "io" "os" "path/filepath" @@ -12,6 +12,8 @@ import ( "sync/atomic" "time" + "github.com/seaweedfs/seaweedfs/weed/filer" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" @@ -38,7 +40,7 @@ func (c *commandFsMetaSave) Help() string { fs.meta.save . # save from current directory fs.meta.save # save from current directory - The meta data will be saved into a local --