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

simplified error logic; fixed incorrect RowsEstimate handling on error

Browse Source
This commit is contained in:
Shlomi Noach 2016-08-18 13:38:23 +02:00
parent 74593ec010
commit 75e0d12302
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
go/logic/applier.go
View File

@ -880,15 +880,14 @@ func (this *Applier) ApplyDMLEventQuery(dmlEvent *binlog.BinlogDMLEvent) error {
return nil return nil
}() }()
if err == nil { if err != nil {
atomic.AddInt64(&this.migrationContext.TotalDMLEventsApplied, 1) err = fmt.Errorf("%s; query=%s; args=%+v", err.Error(), query, args)
return log.Errore(err)
} }
// no error
atomic.AddInt64(&this.migrationContext.TotalDMLEventsApplied, 1)
if this.migrationContext.CountTableRows { if this.migrationContext.CountTableRows {
atomic.AddInt64(&this.migrationContext.RowsEstimate, rowDelta) atomic.AddInt64(&this.migrationContext.RowsEstimate, rowDelta)
} }
if err != nil { return nil
err = fmt.Errorf("%s; query=%s; args=%+v", err.Error(), query, args)
log.Errore(err)
}
return err
} }