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

status hint shows [set] next to existing flag files
github · Jul 27, 2016 · 8a8401b · 8a8401b
2 parents 3b377f1 + b548a6a
commit 8a8401b
Showing 1 changed file with 23 additions and 6 deletions.
diff --git a/go/logic/migrator.go b/go/logic/migrator.go
@@ -654,6 +654,8 @@ func (this *Migrator) onServerCommand(command string, writer *bufio.Writer) (err
 		arg = strings.TrimSpace(tokens[1])
 	}
 
+	throttleHint := "# Note: you may only throttle for as long as your binary logs are not purged\n"
+
 	switch command {
 	case "help":
 		{
@@ -730,6 +732,7 @@ help                                 # This message
 	case "throttle-query":
 		{
 			this.migrationContext.SetThrottleQuery(arg)
+			fmt.Fprintf(writer, throttleHint)
 			this.printStatus(ForcePrintStatusAndHint, writer)
 		}
 	case "throttle-control-replicas":
@@ -744,6 +747,8 @@ help                                 # This message
 	case "throttle", "pause", "suspend":
 		{
 			atomic.StoreInt64(&this.migrationContext.ThrottleCommandedByUser, 1)
+			fmt.Fprintf(writer, throttleHint)
+			this.printStatus(ForcePrintStatusAndHint, writer)
 		}
 	case "no-throttle", "unthrottle", "resume", "continue":
 		{
@@ -874,13 +879,21 @@ func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
 		))
 	}
 	if this.migrationContext.ThrottleFlagFile != "" {
-		fmt.Fprintln(w, fmt.Sprintf("# Throttle flag file: %+v",
-			this.migrationContext.ThrottleFlagFile,
+		setIndicator := ""
+		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 != "" {
-		fmt.Fprintln(w, fmt.Sprintf("# Throttle additional flag file: %+v",
-			this.migrationContext.ThrottleAdditionalFlagFile,
+		setIndicator := ""
+		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 != "" {
@@ -889,8 +902,12 @@ func (this *Migrator) printMigrationStatusHint(writers ...io.Writer) {
 		))
 	}
 	if this.migrationContext.PostponeCutOverFlagFile != "" {
-		fmt.Fprintln(w, fmt.Sprintf("# Postpone cut-over flag file: %+v",
-			this.migrationContext.PostponeCutOverFlagFile,
+		setIndicator := ""
+		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 != "" {