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

printing migration status on waitForEventsUpToLock()

Browse Source
This commit is contained in:
Shlomi Noach 2016-06-15 10:13:06 +02:00
parent 96bc3804eb
commit 85d6883e69
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go/logic/migrator.go
View File

@ -350,7 +350,7 @@ func (this *Migrator) Migrate() (err error) {
log.Infof("Row copy complete") log.Infof("Row copy complete")
this.printStatus() this.printStatus()
if err := this.stopWritesAndCompleteMigration(); err != nil { if err := this.cutOver(); err != nil {
return err return err
} }
@ -361,9 +361,9 @@ func (this *Migrator) Migrate() (err error) {
return nil return nil
} }
// stopWritesAndCompleteMigration performs the final step of migration, based on migration // cutOver performs the final step of migration, based on migration
// type (on replica? bumpy? safe?) // type (on replica? bumpy? safe?)
func (this *Migrator) stopWritesAndCompleteMigration() (err error) { func (this *Migrator) cutOver() (err error) {
if this.migrationContext.Noop { if this.migrationContext.Noop {
log.Debugf("Noop operation; not really swapping tables") log.Debugf("Noop operation; not really swapping tables")
return nil return nil
@ -432,6 +432,7 @@ func (this *Migrator) waitForEventsUpToLock() (err error) {
waitForEventsUpToLockDuration := time.Now().Sub(waitForEventsUpToLockStartTime) waitForEventsUpToLockDuration := time.Now().Sub(waitForEventsUpToLockStartTime)
log.Infof("Done waiting for events up to lock; duration=%+v", waitForEventsUpToLockDuration) log.Infof("Done waiting for events up to lock; duration=%+v", waitForEventsUpToLockDuration)
this.printMigrationStatusHint()
this.printStatus() this.printStatus()
return nil return nil
@ -575,7 +576,6 @@ func (this *Migrator) stopWritesAndCompleteMigrationOnReplica() (err error) {
this.waitForEventsUpToLock() this.waitForEventsUpToLock()
this.printMigrationStatusHint()
log.Info("Table duplicated with new schema. Am not touching the original table. Replication is stopped. You may now compare the two tables to gain trust into this tool's operation") log.Info("Table duplicated with new schema. Am not touching the original table. Replication is stopped. You may now compare the two tables to gain trust into this tool's operation")
return nil return nil
} }