relay, syncer(dm): stricter GTID check when retry replication #3496
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,11 +15,9 @@ package reader | |
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| gmysql "github.com/go-mysql-org/go-mysql/mysql" | ||
| "github.com/go-mysql-org/go-mysql/replication" | ||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/failpoint" | ||
| "go.uber.org/zap" | ||
|
|
@@ -82,16 +80,18 @@ func GetGTIDsForPosFromStreamer(ctx context.Context, r Streamer, endPos gmysql.P | |
| if latestGSet == nil { | ||
| return nil, errors.Errorf("should have a PreviousGTIDsEvent before the GTIDEvent %+v", e.Header) | ||
| } | ||
| nextGTIDStr, err = event.GetGTIDStr(e) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| case *replication.MariadbGTIDEvent: | ||
| if latestGSet == nil { | ||
| return nil, errors.Errorf("should have a MariadbGTIDListEvent before the MariadbGTIDEvent %+v", e.Header) | ||
| } | ||
| nextGTIDStr, err = event.GetGTIDStr(e) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| case *replication.PreviousGTIDsEvent: | ||
| // if GTID enabled, we can get a PreviousGTIDEvent after the FormatDescriptionEvent | ||
| // ref: https://github.com/mysql/mysql-server/blob/8cc757da3d87bf4a1f07dcfb2d3c96fed3806870/sql/binlog.cc#L4549 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,14 +16,12 @@ package relay | |
| import ( | ||
| "bytes" | ||
| "context" | ||
| "io" | ||
| "os" | ||
| "time" | ||
|
|
||
| gmysql "github.com/go-mysql-org/go-mysql/mysql" | ||
| "github.com/go-mysql-org/go-mysql/replication" | ||
| "github.com/pingcap/tidb/parser" | ||
|
|
||
| "github.com/pingcap/ticdc/dm/pkg/binlog/event" | ||
|
|
@@ -219,16 +217,18 @@ func getTxnPosGTIDs(ctx context.Context, filename string, p *parser.Parser) (int | |
| if latestGSet == nil { | ||
| return 0, nil, terror.ErrRelayNeedPrevGTIDEvBeforeGTIDEv.Generate(e.Header) | ||
| } | ||
| nextGTIDStr, err = event.GetGTIDStr(e) | ||
| if err != nil { | ||
| return 0, nil, err | ||
| } | ||
| case *replication.MariadbGTIDEvent: | ||
| if latestGSet == nil { | ||
| return 0, nil, terror.ErrRelayNeedMaGTIDListEvBeforeGTIDEv.Generate(e.Header) | ||
| } | ||
| nextGTIDStr, err = event.GetGTIDStr(e) | ||
| if err != nil { | ||
| return 0, nil, err | ||
| } | ||
| case *replication.PreviousGTIDsEvent: | ||
| // if GTID enabled, we can get a PreviousGTIDEvent after the FormatDescriptionEvent | ||
| // ref: https://github.com/mysql/mysql-server/blob/8cc757da3d87bf4a1f07dcfb2d3c96fed3806870/sql/binlog.cc#L4549 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -15,7 +15,6 @@ package relay | |||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
| "io" | ||||||
| "os" | ||||||
| "path" | ||||||
|
|
@@ -27,7 +26,6 @@ import ( | |||||
| "github.com/BurntSushi/toml" | ||||||
| "github.com/go-mysql-org/go-mysql/mysql" | ||||||
| "github.com/go-mysql-org/go-mysql/replication" | ||||||
| "github.com/pingcap/errors" | ||||||
| "go.uber.org/zap" | ||||||
|
|
||||||
|
|
@@ -75,6 +73,8 @@ type BinlogReader struct { | |||||
| relay Process | ||||||
|
|
||||||
| currentUUID string // current UUID(with suffix) | ||||||
|
|
||||||
| lastFileGracefulEnd bool | ||||||
| } | ||||||
|
|
||||||
| // newBinlogReader creates a new BinlogReader. | ||||||
|
|
@@ -91,13 +91,14 @@ func newBinlogReader(logger log.Logger, cfg *BinlogReaderConfig, relay Process) | |||||
| newtctx := tcontext.NewContext(ctx, logger.WithFields(zap.String("component", "binlog reader"))) | ||||||
|
|
||||||
| binlogReader := &BinlogReader{ | ||||||
| cfg: cfg, | ||||||
| parser: parser, | ||||||
| indexPath: path.Join(cfg.RelayDir, utils.UUIDIndexFilename), | ||||||
| cancel: cancel, | ||||||
| tctx: newtctx, | ||||||
| notifyCh: make(chan interface{}, 1), | ||||||
| relay: relay, | ||||||
| lastFileGracefulEnd: true, | ||||||
| } | ||||||
| binlogReader.relay.RegisterListener(binlogReader) | ||||||
| return binlogReader | ||||||
|
|
@@ -300,7 +301,7 @@ type SwitchPath struct { | |||||
| nextBinlogName string | ||||||
| } | ||||||
|
|
||||||
| // parseRelay parses relay root directory, it supports master-slave switch (switching to next sub directory). | ||||||
| func (r *BinlogReader) parseRelay(ctx context.Context, s *LocalStreamer, pos mysql.Position) error { | ||||||
| currentUUID, _, realPos, err := binlog.ExtractPos(pos, r.uuids) | ||||||
| if err != nil { | ||||||
|
|
@@ -338,6 +339,16 @@ func (r *BinlogReader) parseRelay(ctx context.Context, s *LocalStreamer, pos mys | |||||
| realPos.Name = switchPath.nextBinlogName | ||||||
| realPos.Pos = binlog.FileHeaderLen // start from pos 4 for next sub directory / file | ||||||
| r.tctx.L().Info("switching to next ready sub directory", zap.String("next uuid", r.currentUUID), zap.Stringer("position", pos)) | ||||||
|
|
||||||
| // when switching sub directory, last binlog file may contain unfinished transaction, so we send a notification. | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| if !r.lastFileGracefulEnd { | ||||||
| s.ch <- &replication.BinlogEvent{ | ||||||
| RawData: []byte(ErrorMaybeDuplicateEvent.Error()), | ||||||
| Header: &replication.EventHeader{ | ||||||
| EventType: replication.IGNORABLE_EVENT, | ||||||
| }, | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -485,8 +496,7 @@ func (r *BinlogReader) parseFileAsPossible(ctx context.Context, s *LocalStreamer | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| // parseFile parses single relay log file from specified offset. | ||||||
| func (r *BinlogReader) parseFile( | ||||||
| ctx context.Context, | ||||||
| s *LocalStreamer, | ||||||
|
|
@@ -499,6 +509,7 @@ func (r *BinlogReader) parseFile( | |||||
| } | ||||||
|
|
||||||
| offset := state.latestPos | ||||||
| r.lastFileGracefulEnd = false | ||||||
|
|
||||||
| onEventFunc := func(e *replication.BinlogEvent) error { | ||||||
| if ce := r.tctx.L().Check(zap.DebugLevel, ""); ce != nil { | ||||||
|
|
@@ -520,6 +531,7 @@ func (r *BinlogReader) parseFile( | |||||
| if e.Header.Timestamp != 0 && e.Header.LogPos != 0 { | ||||||
| // not fake rotate event, update file pos | ||||||
| state.latestPos = int64(e.Header.LogPos) | ||||||
| r.lastFileGracefulEnd = true | ||||||
| } else { | ||||||
| r.tctx.L().Debug("skip fake rotate event", zap.Reflect("header", e.Header)) | ||||||
| } | ||||||
|
|
@@ -538,8 +550,11 @@ func (r *BinlogReader) parseFile( | |||||
| state.latestPos = int64(e.Header.LogPos) | ||||||
| break | ||||||
| } | ||||||
| gtidStr, err2 := event.GetGTIDStr(e) | ||||||
| if err2 != nil { | ||||||
| return errors.Trace(err2) | ||||||
|
There was a problem hiding this comment. Seems we have abandoned trace There was a problem hiding this comment. I remember I have seen some zap logger printing error stack 🤔 |
||||||
| } | ||||||
| state.replaceWithHeartbeat, err = r.advanceCurrentGtidSet(gtidStr) | ||||||
| if err != nil { | ||||||
| return errors.Trace(err) | ||||||
| } | ||||||
|
|
@@ -549,8 +564,11 @@ func (r *BinlogReader) parseFile( | |||||
| state.latestPos = int64(e.Header.LogPos) | ||||||
| break | ||||||
| } | ||||||
| gtidStr, err2 := event.GetGTIDStr(e) | ||||||
| if err2 != nil { | ||||||
| return errors.Trace(err2) | ||||||
| } | ||||||
| state.replaceWithHeartbeat, err = r.advanceCurrentGtidSet(gtidStr) | ||||||
| if err != nil { | ||||||
| return errors.Trace(err) | ||||||
| } | ||||||
|
|
@@ -627,15 +645,6 @@ func (r *BinlogReader) parseFile( | |||||
| if err != nil { | ||||||
| if state.possibleLast && isIgnorableParseError(err) { | ||||||
| r.tctx.L().Warn("fail to parse relay log file, meet some ignorable error", zap.String("file", state.fullPath), zap.Int64("offset", offset), zap.Error(err)) | ||||||
Ehco1996 marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } else { | ||||||
| r.tctx.L().Error("parse relay log file", zap.String("file", state.fullPath), zap.Int64("offset", offset), zap.Error(err)) | ||||||
| return false, false, terror.ErrParserParseRelayLog.Delegate(err, state.fullPath) | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.