From cd8a3b99bb095bf19b7b8fac54ec1360bc754e9b Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 23 Mar 2019 12:57:35 -0700 Subject: [PATCH] textual changes --- weed/shell/command_volume_fix_replication.go | 6 ++++++ weed/shell/shell_liner.go | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/weed/shell/command_volume_fix_replication.go b/weed/shell/command_volume_fix_replication.go index 2ec850140..b8daa2d9f 100644 --- a/weed/shell/command_volume_fix_replication.go +++ b/weed/shell/command_volume_fix_replication.go @@ -32,6 +32,12 @@ func (c *commandVolumeFixReplication) Help() string { volume.fix.replication -n # do not take action volume.fix.replication # actually copying the volume files and mount the volume + Note: + * each time this will only add back one replica for one volume id. If there are multiple replicas + are missing, e.g. multiple volume servers are new, you may need to run this multiple times. + * do not run this too quick within seconds, since the new volume replica may take a few seconds + to register itself to the master. + ` } diff --git a/weed/shell/shell_liner.go b/weed/shell/shell_liner.go index 403980568..2fc64b60f 100644 --- a/weed/shell/shell_liner.go +++ b/weed/shell/shell_liner.go @@ -6,6 +6,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/wdclient" "io" "os" + "path" "regexp" "strings" @@ -15,7 +16,7 @@ import ( var ( line *liner.State - historyPath = "/tmp/weed-shell" + historyPath = path.Join(os.TempDir(), "weed-shell") ) func RunShell(options ShellOptions) { @@ -26,9 +27,9 @@ func RunShell(options ShellOptions) { line.SetCtrlCAborts(true) setCompletionHandler() - loadHisotry() + loadHistory() - defer saveHisotry() + defer saveHistory() reg, _ := regexp.Compile(`'.*?'|".*?"|\S+`) @@ -129,14 +130,14 @@ func setCompletionHandler() { }) } -func loadHisotry() { +func loadHistory() { if f, err := os.Open(historyPath); err == nil { line.ReadHistory(f) f.Close() } } -func saveHisotry() { +func saveHistory() { if f, err := os.Create(historyPath); err != nil { fmt.Printf("Error writing history file: %v\n", err) } else {