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

Merge pull request #177 from github/interactive-sup-fix

Browse Source 
fixed sup printing heuristic
This commit is contained in:
Shlomi Noach 2016-08-19 09:42:17 +02:00 committed by GitHub
commit 36a28637f2
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
go/logic/migrator.go
View File

@ -986,20 +986,22 @@ func (this *Migrator) printStatus(rule PrintStatusRule, writers ...io.Writer) {
} }
shouldPrintStatus := false shouldPrintStatus := false
if elapsedSeconds <= 60 { if rule == HeuristicPrintStatusRule {
shouldPrintStatus = true if elapsedSeconds <= 60 {
} else if etaSeconds <= 60 { shouldPrintStatus = true
shouldPrintStatus = true } else if etaSeconds <= 60 {
} else if etaSeconds <= 180 { shouldPrintStatus = true
shouldPrintStatus = (elapsedSeconds%5 == 0) } else if etaSeconds <= 180 {
} else if elapsedSeconds <= 180 { shouldPrintStatus = (elapsedSeconds%5 == 0)
shouldPrintStatus = (elapsedSeconds%5 == 0) } else if elapsedSeconds <= 180 {
} else if this.migrationContext.TimeSincePointOfInterest().Seconds() <= 60 { shouldPrintStatus = (elapsedSeconds%5 == 0)
shouldPrintStatus = (elapsedSeconds%5 == 0) } else if this.migrationContext.TimeSincePointOfInterest().Seconds() <= 60 {
shouldPrintStatus = (elapsedSeconds%5 == 0)
} else {
shouldPrintStatus = (elapsedSeconds%30 == 0)
}
} else { } else {
shouldPrintStatus = (elapsedSeconds%30 == 0) // Not heuristic
}
if rule == ForcePrintStatusRule || rule == ForcePrintStatusAndHintRule {
shouldPrintStatus = true shouldPrintStatus = true
} }
if !shouldPrintStatus { if !shouldPrintStatus {