Merge pull request #64 from github/safe-cut-over

Safe cut over

Author: Shlomi Noach

build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #
-RELEASE_VERSION="0.8.9"
+RELEASE_VERSION="0.9.1"
 
 buildpath=/tmp/gh-ost
 target=gh-ost

go/base/context.go

@@ -31,9 +31,8 @@ const (
 type CutOver int
 
 const (
-	CutOverTwoStep       CutOver = iota
-	CutOverVoluntaryLock         = iota
-	CutOverUdfWait               = iota
+	CutOverSafe    CutOver = iota
+	CutOverTwoStep         = iota
 )
 
 const (
@@ -100,6 +99,7 @@ type MigrationContext struct {
 	isThrottled               bool
 	throttleReason            string
 	throttleMutex             *sync.Mutex
+	IsPostponingCutOver       int64
 
 	OriginalTableColumns             *sql.ColumnList
 	OriginalTableUniqueKeys          [](*sql.UniqueKey)

go/cmd/gh-ost/main.go

@@ -128,12 +128,10 @@ func main() {
 		log.Fatalf("--allow-on-master and --test-on-replica are mutually exclusive")
 	}
 	switch *cutOver {
+	case "safe", "default", "":
+		migrationContext.CutOverType = base.CutOverSafe
 	case "two-step":
 		migrationContext.CutOverType = base.CutOverTwoStep
-	case "voluntary-lock":
-		migrationContext.CutOverType = base.CutOverVoluntaryLock
-	case "":
-		log.Fatalf("--cut-over must be specified")
 	default:
 		log.Fatalf("Unknown cut-over: %s", *cutOver)
 	}