Skip to content

Commit 8a8401b

Browse files
author
Shlomi Noach
authored
Merge pull request #112 from github/flag-file-indicator
status hint shows [set] next to existing flag files
2 parents 3b377f1 + b548a6a commit 8a8401b

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

go/logic/migrator.go

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,8 @@ func (this *Migrator) onServerCommand(command string, writer *bufio.Writer) (err
654654
arg = strings.TrimSpace(tokens[1])
655655
}
656656

657+
throttleHint := "# Note: you may only throttle for as long as your binary logs are not purged\n"
658+
657659
switch command {
658660
case "help":
659661
{
@@ -730,6 +732,7 @@ help # This message
730732
case "throttle-query":
731733
{
732734
this.migrationContext.SetThrottleQuery(arg)
735+
fmt.Fprintf(writer, throttleHint)
733736
this.printStatus(ForcePrintStatusAndHint, writer)
734737
}
735738
case "throttle-control-replicas":
@@ -744,6 +747,8 @@ help # This message
744747
case "throttle", "pause", "suspend":
745748
{
746749
atomic.StoreInt64(&this.migrationContext.ThrottleCommandedByUser, 1)
750+
fmt.Fprintf(writer, throttleHint)
751+
this.printStatus(ForcePrintStatusAndHint, writer)
747752
}
748753
case "no-throttle", "unthrottle", "resume", "continue":
749754
{
@@ -874,13 +879,21 @@ func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
874879
))
875880
}
876881
if this.migrationContext.ThrottleFlagFile != "" {
877-
fmt.Fprintln(w, fmt.Sprintf("# Throttle flag file: %+v",
878-
this.migrationContext.ThrottleFlagFile,
882+
setIndicator := ""
883+
if base.FileExists(this.migrationContext.ThrottleFlagFile) {
884+
setIndicator = "[set]"
885+
}
886+
fmt.Fprintln(w, fmt.Sprintf("# Throttle flag file: %+v %+v",
887+
this.migrationContext.ThrottleFlagFile, setIndicator,
879888
))
880889
}
881890
if this.migrationContext.ThrottleAdditionalFlagFile != "" {
882-
fmt.Fprintln(w, fmt.Sprintf("# Throttle additional flag file: %+v",
883-
this.migrationContext.ThrottleAdditionalFlagFile,
891+
setIndicator := ""
892+
if base.FileExists(this.migrationContext.ThrottleAdditionalFlagFile) {
893+
setIndicator = "[set]"
894+
}
895+
fmt.Fprintln(w, fmt.Sprintf("# Throttle additional flag file: %+v %+v",
896+
this.migrationContext.ThrottleAdditionalFlagFile, setIndicator,
884897
))
885898
}
886899
if throttleQuery := this.migrationContext.GetThrottleQuery(); throttleQuery != "" {
@@ -889,8 +902,12 @@ func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
889902
))
890903
}
891904
if this.migrationContext.PostponeCutOverFlagFile != "" {
892-
fmt.Fprintln(w, fmt.Sprintf("# Postpone cut-over flag file: %+v",
893-
this.migrationContext.PostponeCutOverFlagFile,
905+
setIndicator := ""
906+
if base.FileExists(this.migrationContext.PostponeCutOverFlagFile) {
907+
setIndicator = "[set]"
908+
}
909+
fmt.Fprintln(w, fmt.Sprintf("# Postpone cut-over flag file: %+v %+v",
910+
this.migrationContext.PostponeCutOverFlagFile, setIndicator,
894911
))
895912
}
896913
if this.migrationContext.PanicFlagFile != "" {

0 commit comments

Comments
 (0)