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

supporting 'unpostpone' command

Browse Source
This commit is contained in:
Shlomi Noach 2016-07-01 10:59:09 +02:00
parent b583458bc2
commit 37e3c94c87
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
go/logic/migrator.go
View File

@ -67,6 +67,7 @@ type Migrator struct {
allEventsUpToLockProcessedInjectedFlag int64 allEventsUpToLockProcessedInjectedFlag int64
inCutOverCriticalActionFlag int64 inCutOverCriticalActionFlag int64
cleanupImminentFlag int64 cleanupImminentFlag int64
userCommandedUnpostponeFlag int64
// copyRowsQueue should not be buffered; if buffered some non-damaging but // copyRowsQueue should not be buffered; if buffered some non-damaging but
// excessive work happens at the end of the iteration as new copy-jobs arrive befroe realizing the copy is complete // excessive work happens at the end of the iteration as new copy-jobs arrive befroe realizing the copy is complete
copyRowsQueue chan tableWriteFunc copyRowsQueue chan tableWriteFunc
@ -447,6 +448,9 @@ func (this *Migrator) cutOver() (err error) {
if this.migrationContext.PostponeCutOverFlagFile == "" { if this.migrationContext.PostponeCutOverFlagFile == "" {
return false, nil return false, nil
} }
if atomic.LoadInt64(&this.userCommandedUnpostponeFlag) > 0 {
return false, nil
}
if base.FileExists(this.migrationContext.PostponeCutOverFlagFile) { if base.FileExists(this.migrationContext.PostponeCutOverFlagFile) {
// Throttle file defined and exists! // Throttle file defined and exists!
atomic.StoreInt64(&this.migrationContext.IsPostponingCutOver, 1) atomic.StoreInt64(&this.migrationContext.IsPostponingCutOver, 1)
@ -792,6 +796,7 @@ throttle-query=<query> # Set a new throttle-query
throttle-control-replicas=<replicas> # throttle-control-replicas=<replicas> #
throttle # Force throttling throttle # Force throttling
no-throttle # End forced throttling (other throttling may still apply) no-throttle # End forced throttling (other throttling may still apply)
unpostpone # Bail out a cut-over postpone; proceed to cut-over
panic # panic and quit without cleanup panic # panic and quit without cleanup
help # This message help # This message
`) `)
@ -846,6 +851,15 @@ help # This message
{ {
atomic.StoreInt64(&this.migrationContext.ThrottleCommandedByUser, 0) atomic.StoreInt64(&this.migrationContext.ThrottleCommandedByUser, 0)
} }
case "unpostpone", "no-postpone", "cut-over":
{
if atomic.LoadInt64(&this.migrationContext.IsPostponingCutOver) > 0 {
atomic.StoreInt64(&this.userCommandedUnpostponeFlag, 1)
fmt.Fprintf(writer, "Unpostponed\n")
} else {
fmt.Fprintf(writer, "You may only invoke this when gh-ost is actively postponing migration. At this time it is not.\n")
}
}
case "panic": case "panic":
{ {
err := fmt.Errorf("User commanded 'panic'. I will now panic, without cleanup. PANIC!") err := fmt.Errorf("User commanded 'panic'. I will now panic, without cleanup. PANIC!")