Skip to content

Commit

Permalink
puller: ignore fallen back resolved ts (#2077) (#2086)
Browse files Browse the repository at this point in the history
  • Loading branch information
ti-chi-bot authored Jun 18, 2021
1 parent 3183110 commit 9aa4047
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion cdc/puller/puller.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,18 @@ func (p *pullerImpl) Run(ctx context.Context) error {
lastResolvedTs := p.checkpointTs
g.Go(func() error {
output := func(raw *model.RawKVEntry) error {
// even after https://github.com/pingcap/ticdc/pull/2038, kv client
// could still miss region change notification, which leads to resolved
// ts update missing in puller, however resolved ts fallback here can
// be ignored since no late data is received and the guarantee of
// resolved ts is not broken.
if raw.CRTs < p.resolvedTs || (raw.CRTs == p.resolvedTs && raw.OpType != model.OpTypeResolved) {
log.Panic("The CRTs must be greater than the resolvedTs",
log.Warn("The CRTs is fallen back in pulelr",
zap.Reflect("row", raw),
zap.Uint64("CRTs", raw.CRTs),
zap.Uint64("resolvedTs", p.resolvedTs),
zap.Int64("tableID", tableID))
return nil
}
select {
case <-ctx.Done():
Expand Down

0 comments on commit 9aa4047

Please sign in to comment.