From 45b63f65006c4c1778638ae0266dc2eab6ecbbdc Mon Sep 17 00:00:00 2001
From: Shlomi Noach <shlomi-noach@github.com>
Date: Sat, 24 Dec 2016 10:07:59 +0200
Subject: [PATCH] applying IsResurrected flag

---
 go/base/context.go   | 2 +-
 go/logic/migrator.go | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/go/base/context.go b/go/base/context.go
index 9754eff..91ac8e4 100644
--- a/go/base/context.go
+++ b/go/base/context.go
@@ -162,7 +162,7 @@ type MigrationContext struct {
 	UserCommandedUnpostponeFlag            int64
 	CutOverCompleteFlag                    int64
 	InCutOverCriticalSectionFlag           int64
-	IsResurrected                          bool
+	IsResurrected                          int64
 
 	OriginalTableColumnsOnApplier    *sql.ColumnList
 	OriginalTableColumns             *sql.ColumnList
diff --git a/go/logic/migrator.go b/go/logic/migrator.go
index 38b9132..b5950eb 100644
--- a/go/logic/migrator.go
+++ b/go/logic/migrator.go
@@ -301,6 +301,7 @@ func (this *Migrator) readResurrectedContext() error {
 
 func (this *Migrator) applyResurrectedContext() error {
 	this.migrationContext.ApplyResurrectedContext(this.resurrectedContext)
+	atomic.StoreInt64(&this.migrationContext.IsResurrected, 1)
 
 	return nil
 }
@@ -1094,12 +1095,14 @@ func (this *Migrator) executeWriteFuncs() error {
 	for {
 		this.throttler.throttle(nil)
 
-		// We give higher priority to event processing, then secondary priority to
-		// rowcopy
+		// We give higher priority to event processing, then secondary priority to rowcopy
 		select {
 		case <-contextDumpTick:
 			{
-				if !this.migrationContext.Resurrect || this.migrationContext.IsResurrected {
+				if !(this.migrationContext.Resurrect && atomic.LoadInt64(&this.migrationContext.IsResurrected) == 0) {
+					// Not dumping context if we're _in the process of resurrecting_...
+					// otherwise, we dump the context. Note that this operation works sequentially to any row copy or
+					// event handling. There is no concurrency issue here.
 					if jsonString, err := this.migrationContext.ToJSON(); err == nil {
 						this.applier.WriteChangelog("context", jsonString)
 						log.Debugf("Context dumped. Applied coordinates: %+v", this.migrationContext.AppliedBinlogCoordinates)