Skip to content

Backport vstream fix #7

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
tanjinx merged 5 commits into from
Aug 31, 2022
Merged

Backport vstream fix #7

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5c68c7
patch https://github.com/vitessio/vitess/pull/9978
tanjinx Aug 30, 2022
5e02d6e
backport https://github.com/vitessio/vitess/pull/10132
tanjinx Aug 30, 2022
7d39606
fix missing patches
tanjinx Aug 30, 2022
0d2a8c4
Revert "backport https://github.com/vitessio/vitess/pull/10132"
tanjinx Aug 31, 2022
83e4047
Revert "fix missing patches"
tanjinx Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions go/vt/vttablet/tabletserver/vstreamer/vstreamer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,14 +511,23 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e
// will generate a new plan and FIELD event.
id := ev.TableID(vs.format)

if _, ok := vs.plans[id]; ok {
return nil, nil
}

tm, err := ev.TableMap(vs.format)
if err != nil {
return nil, err
}

if plan, ok := vs.plans[id]; ok {
// When the underlying mysql server restarts the table map can change.
// Usually the vstreamer will also error out when this happens, and vstreamer re-initializes its table map.
// But if the vstreamer is not aware of the restart, we could get an id that matches one in the cache, but
// is for a different table. We then invalidate and recompute the plan for this id.
if plan == nil || plan.Table.Name == tm.Name {
return nil, nil
}
vs.plans[id] = nil
log.Infof("table map changed: id %d for %s has changed to %s", id, plan.Table.Name, tm.Name)
}

if tm.Database == "_vt" && tm.Name == "resharding_journal" {
// A journal is a special case that generates a JOURNAL event.
return nil, vs.buildJournalPlan(id, tm)
Expand Down