aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2019-07-26 09:35:22 -0700
committerChris Lu <chris.lu@gmail.com>2019-07-26 09:35:22 -0700
commitfb90d635897e5be2894e5bc158b5c35c7f7e2415 (patch)
treeb78e97678f24458c6a14ce499bfc82ba6ed7b774
parent7b5883f526ec17e4efedcf4412f76f9e2e744f7f (diff)
downloadseaweedfs-fb90d635897e5be2894e5bc158b5c35c7f7e2415.tar.xz
seaweedfs-fb90d635897e5be2894e5bc158b5c35c7f7e2415.zip
shell: Added minor changes to `fs.meta.save`
* added an option to set the output file name * added an option to see verbose output, default to non-verbose mode related to: https://github.com/chrislusf/seaweedfs/issues/1019
-rw-r--r--weed/shell/command_fs_meta_save.go30
1 files changed, 22 insertions, 8 deletions
diff --git a/weed/shell/command_fs_meta_save.go b/weed/shell/command_fs_meta_save.go
index 6ca395fae..e710fe297 100644
--- a/weed/shell/command_fs_meta_save.go
+++ b/weed/shell/command_fs_meta_save.go
@@ -2,6 +2,7 @@ package shell
import (
"context"
+ "flag"
"fmt"
"io"
"os"
@@ -27,10 +28,11 @@ func (c *commandFsMetaSave) Name() string {
func (c *commandFsMetaSave) Help() string {
return `save all directory and file meta data to a local file for metadata backup.
- fs.meta.save / # save from the root
- fs.meta.save /path/to/save # save from the directory /path/to/save
- fs.meta.save . # save from current directory
- fs.meta.save # save from current directory
+ fs.meta.save / # save from the root
+ fs.meta.save -v -o t.meta / # save from the root, output to t.meta file.
+ fs.meta.save /path/to/save # save from the directory /path/to/save
+ fs.meta.save . # save from current directory
+ fs.meta.save # save from current directory
The meta data will be saved into a local <filer_host>-<port>-<time>.meta file.
These meta data can be later loaded by fs.meta.load command,
@@ -42,7 +44,14 @@ func (c *commandFsMetaSave) Help() string {
func (c *commandFsMetaSave) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
- filerServer, filerPort, path, err := commandEnv.parseUrl(findInputDirectory(args))
+ fsMetaSaveCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+ verbose := fsMetaSaveCommand.Bool("v", false, "print out each processed files")
+ outputFileName := fsMetaSaveCommand.String("o", "", "output the meta data to this file")
+ if err = fsMetaSaveCommand.Parse(args); err != nil {
+ return nil
+ }
+
+ filerServer, filerPort, path, err := commandEnv.parseUrl(findInputDirectory(fsMetaSaveCommand.Args()))
if err != nil {
return err
}
@@ -52,8 +61,11 @@ func (c *commandFsMetaSave) Do(args []string, commandEnv *CommandEnv, writer io.
return commandEnv.withFilerClient(ctx, filerServer, filerPort, func(client filer_pb.SeaweedFilerClient) error {
t := time.Now()
- fileName := fmt.Sprintf("%s-%d-%4d%02d%02d-%02d%02d%02d.meta",
- filerServer, filerPort, t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second())
+ fileName := *outputFileName
+ if fileName == "" {
+ fileName = fmt.Sprintf("%s-%d-%4d%02d%02d-%02d%02d%02d.meta",
+ filerServer, filerPort, t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second())
+ }
dst, err := os.OpenFile(fileName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
if err != nil {
@@ -88,7 +100,9 @@ func (c *commandFsMetaSave) Do(args []string, commandEnv *CommandEnv, writer io.
fileCount++
}
- println(parentPath.Child(entry.Name))
+ if *verbose {
+ println(parentPath.Child(entry.Name))
+ }
return nil