Skip to content

move gtid update after all event handlers are executed #379

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

Merged
merged 2 commits into from
May 7, 2019
Merged

move gtid update after all event handlers are executed #379

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47718bf
move gtid update after all event handlers are executed
taylorchu Apr 20, 2019
d3dc625
Merge branch 'master' into update-gtid
IANTHEREAL May 6, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
move gtid update after all event handlers are executed 
It is a common use case that we have a separate goroutine to update gtid set. We have to ensure that gtid saver sees updated gtid only after all the tasks are done in event handlers.
  • Loading branch information
@taylorchu
taylorchu committed Apr 20, 2019
commit 47718bfe61d80f93e6869bc9eb28eefddd07dde3
14 changes: 7 additions & 7 deletions canal/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/pingcap/errors"
"github.com/satori/go.uuid"
uuid "github.com/satori/go.uuid"
"github.com/siddontang/go-log/log"
"github.com/siddontang/go-mysql/mysql"
"github.com/siddontang/go-mysql/replication"
Expand Down Expand Up @@ -92,14 +92,14 @@ func (c *Canal) runSyncBinlog() error {
}
continue
case *replication.XIDEvent:
if e.GSet != nil {
c.master.UpdateGTIDSet(e.GSet)
}
savePos = true
// try to save the position later
if err := c.eventHandler.OnXID(pos); err != nil {
return errors.Trace(err)
}
if e.GSet != nil {
c.master.UpdateGTIDSet(e.GSet)
}
case *replication.MariadbGTIDEvent:
// try to save the GTID later
gtid, err := mysql.ParseMariadbGTIDSet(e.GTID.String())
Expand All @@ -119,9 +119,6 @@ func (c *Canal) runSyncBinlog() error {
return errors.Trace(err)
}
case *replication.QueryEvent:
if e.GSet != nil {
c.master.UpdateGTIDSet(e.GSet)
}
var (
mb [][]byte
db []byte
Expand Down Expand Up @@ -159,6 +156,9 @@ func (c *Canal) runSyncBinlog() error {
if err = c.eventHandler.OnDDL(pos, e); err != nil {
return errors.Trace(err)
}
if e.GSet != nil {
c.master.UpdateGTIDSet(e.GSet)
}
default:
continue
}
Expand Down