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

remove nonFatalHint argument from retryOperation; add retryOperationWithExponentialBackoff and conditionally use it

Browse Source
This commit is contained in:
Kurt Kotzur 2018-03-15 17:41:15 -07:00
parent 3f0443833d
commit bd62b19b0b
No known key found for this signature in database
GPG Key ID: E5CAECC75F948BBF
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
go/logic/migrator.go
View File

@ -130,7 +130,7 @@ func (this *Migrator) sleepWhileTrue(operation func() (bool, error)) error {
// retryOperation attempts up to `count` attempts at running given function,
// exiting as soon as it returns with non-error.
func (this *Migrator) retryOperation(operation func() error, notFatalHint ...bool) (err error) {
func (this *Migrator) retryOperation(operation func() error) (err error) {
maxRetries := int(this.migrationContext.MaxRetries())
for i := 0; i < maxRetries; i++ {
if i != 0 {
@ -143,8 +143,23 @@ func (this *Migrator) retryOperation(operation func() error, notFatalHint ...boo
}
// there's an error. Let's try again.
}
if len(notFatalHint) == 0 {
this.migrationContext.PanicAbort <- err
return err
}
func (this *Migrator) retryOperationWithExponentialBackoff(operation func() error) (err error) {
var numAttempts float64
for {
err = operation()
if err == nil {
return nil
}
interval := math.Exp2(numAttempts)
if interval > this.migrationContext.CutOverExponentialBackoffMaxInterval {
break
} else {
time.Sleep(interval * time.Second)
}
}
return err
}
@ -372,7 +387,13 @@ func (this *Migrator) Migrate() (err error) {
if err := this.hooksExecutor.onBeforeCutOver(); err != nil {
return err
}
if err := this.retryOperation(this.cutOver); err != nil {
var retrier func(func() error) error
if this.migrationContext.CutOverExponentialBackoff {
retrier = this.retryOperationWithExponentialBackoff
} else {
retrier = this.retryOperation
}
if err := retrier(this.cutOver); err != nil {
return err
}
atomic.StoreInt64(&this.migrationContext.CutOverCompleteFlag, 1)