octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112 from github/flag-file-indicator

Browse Source 
status hint shows [set] next to existing flag files
This commit is contained in:
Shlomi Noach 2016-07-27 10:57:59 +02:00 committed by GitHub
commit 8a8401be49
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
go/logic/migrator.go
View File

@ -654,6 +654,8 @@ func (this *Migrator) onServerCommand(command string, writer *bufio.Writer) (err
arg = strings.TrimSpace(tokens[1]) arg = strings.TrimSpace(tokens[1])
} }
throttleHint := "# Note: you may only throttle for as long as your binary logs are not purged\n"
switch command { switch command {
case "help": case "help":
{ {
@ -730,6 +732,7 @@ help # This message
case "throttle-query": case "throttle-query":
{ {
this.migrationContext.SetThrottleQuery(arg) this.migrationContext.SetThrottleQuery(arg)
fmt.Fprintf(writer, throttleHint)
this.printStatus(ForcePrintStatusAndHint, writer) this.printStatus(ForcePrintStatusAndHint, writer)
} }
case "throttle-control-replicas": case "throttle-control-replicas":
@ -744,6 +747,8 @@ help # This message
case "throttle", "pause", "suspend": case "throttle", "pause", "suspend":
{ {
atomic.StoreInt64(&this.migrationContext.ThrottleCommandedByUser, 1) atomic.StoreInt64(&this.migrationContext.ThrottleCommandedByUser, 1)
fmt.Fprintf(writer, throttleHint)
this.printStatus(ForcePrintStatusAndHint, writer)
} }
case "no-throttle", "unthrottle", "resume", "continue": case "no-throttle", "unthrottle", "resume", "continue":
{ {
@ -874,13 +879,21 @@ func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
)) ))
} }
if this.migrationContext.ThrottleFlagFile != "" { if this.migrationContext.ThrottleFlagFile != "" {
fmt.Fprintln(w, fmt.Sprintf("# Throttle flag file: %+v", setIndicator := ""
this.migrationContext.ThrottleFlagFile, if base.FileExists(this.migrationContext.ThrottleFlagFile) {
setIndicator = "[set]"
}
fmt.Fprintln(w, fmt.Sprintf("# Throttle flag file: %+v %+v",
this.migrationContext.ThrottleFlagFile, setIndicator,
)) ))
} }
if this.migrationContext.ThrottleAdditionalFlagFile != "" { if this.migrationContext.ThrottleAdditionalFlagFile != "" {
fmt.Fprintln(w, fmt.Sprintf("# Throttle additional flag file: %+v", setIndicator := ""
this.migrationContext.ThrottleAdditionalFlagFile, if base.FileExists(this.migrationContext.ThrottleAdditionalFlagFile) {
setIndicator = "[set]"
}
fmt.Fprintln(w, fmt.Sprintf("# Throttle additional flag file: %+v %+v",
this.migrationContext.ThrottleAdditionalFlagFile, setIndicator,
)) ))
} }
if throttleQuery := this.migrationContext.GetThrottleQuery(); throttleQuery != "" { if throttleQuery := this.migrationContext.GetThrottleQuery(); throttleQuery != "" {
@ -889,8 +902,12 @@ func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
)) ))
} }
if this.migrationContext.PostponeCutOverFlagFile != "" { if this.migrationContext.PostponeCutOverFlagFile != "" {
fmt.Fprintln(w, fmt.Sprintf("# Postpone cut-over flag file: %+v", setIndicator := ""
this.migrationContext.PostponeCutOverFlagFile, if base.FileExists(this.migrationContext.PostponeCutOverFlagFile) {
setIndicator = "[set]"
}
fmt.Fprintln(w, fmt.Sprintf("# Postpone cut-over flag file: %+v %+v",
this.migrationContext.PostponeCutOverFlagFile, setIndicator,
)) ))
} }
if this.migrationContext.PanicFlagFile != "" { if this.migrationContext.PanicFlagFile != "" {