Skip to content

use sync.Once to avoid to send drop cutover sentry table to mysql twice #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MOON-CLJ wants to merge 8 commits into from
Closed

use sync.Once to avoid to send drop cutover sentry table to mysql twice #755

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49262c5
use mutex to avoid to send drop cutover sentry table to mysql twice
MOON-CLJ Jun 11, 2019
46211ee
Revert "use mutex to avoid to send drop cutover sentry table to mysql…
MOON-CLJ Jun 11, 2019
8405a71
use sync.Once to ensure drop cutover sentry table once
MOON-CLJ Jun 11, 2019
43a3497
fix use *sync.Once
MOON-CLJ Jun 12, 2019
6942ccc
Merge branch 'master' into fix_dup_delete_old_table3
timvaillancourt Aug 19, 2020
ad79e1b
Fix ci
timvaillancourt Aug 19, 2020
72cb96a
Merge branch 'master' into fix_dup_delete_old_table3
timvaillancourt Aug 19, 2020
49a466f
Merge branch 'master' into fix_dup_delete_old_table3
timvaillancourt Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions go/logic/applier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/outbrain/golib/log"
"github.com/outbrain/golib/sqlutils"
"sync"
)

const (
Expand Down Expand Up @@ -52,11 +53,12 @@ func newDmlBuildResultError(err error) *dmlBuildResult {
// Applier is the one to actually write row data and apply binlog events onto the ghost table.
// It is where the ghost & changelog tables get created. It is where the cut-over phase happens.
type Applier struct {
connectionConfig *mysql.ConnectionConfig
db *gosql.DB
singletonDB *gosql.DB
migrationContext *base.MigrationContext
finishedMigrating int64
connectionConfig *mysql.ConnectionConfig
db *gosql.DB
singletonDB *gosql.DB
migrationContext *base.MigrationContext
finishedMigrating int64
dropAtomicCutOverSentryTableMutex sync.Mutex
}

func NewApplier(migrationContext *base.MigrationContext) *Applier {
Expand Down Expand Up @@ -738,6 +740,9 @@ func (this *Applier) ExpectProcess(sessionId int64, stateHint, infoHint string)
// DropAtomicCutOverSentryTableIfExists checks if the "old" table name
// happens to be a cut-over magic table; if so, it drops it.
func (this *Applier) DropAtomicCutOverSentryTableIfExists() error {
this.dropAtomicCutOverSentryTableMutex.Lock()
defer this.dropAtomicCutOverSentryTableMutex.Unlock()

log.Infof("Looking for magic cut-over table")
tableName := this.migrationContext.GetOldTableName()
rowMap := this.showTableStatus(tableName)
Expand Down Expand Up @@ -854,6 +859,7 @@ func (this *Applier) AtomicCutOverMagicLock(sessionIdChan chan int64, tableLocke

// The magic table is here because we locked it. And we are the only ones allowed to drop it.
// And in fact, we will:
this.dropAtomicCutOverSentryTableMutex.Lock()
log.Infof("Dropping magic cut-over table")
query = fmt.Sprintf(`drop /* gh-ost */ table if exists %s.%s`,
sql.EscapeName(this.migrationContext.DatabaseName),
Expand All @@ -863,6 +869,7 @@ func (this *Applier) AtomicCutOverMagicLock(sessionIdChan chan int64, tableLocke
log.Errore(err)
// We DO NOT return here because we must `UNLOCK TABLES`!
}
this.dropAtomicCutOverSentryTableMutex.Unlock()

// Tables still locked
log.Infof("Releasing lock from %s.%s, %s.%s",
Expand Down