Skip to content
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

cdc: ignore redo log meta regress for restarting #6320

Merged
merged 3 commits into from
Jul 18, 2022
Merged

cdc: ignore redo log meta regress for restarting #6320

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cd1cd3
redo meta can regress exactly
hicqu Jul 18, 2022
8748831
cdc: ignore redo meta regress for restarting
hicqu Jul 18, 2022
4bf1764
Merge branch 'master' into ignore-log-meta-regress
hicqu Jul 18, 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
5 changes: 3 additions & 2 deletions cdc/redo/writer/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,20 +508,21 @@ func (l *LogWriter) maybeUpdateMeta(checkpointTs, resolvedTs uint64) ([]byte, er
l.metaLock.Lock()
defer l.metaLock.Unlock()

// NOTE: both checkpoint and resolved can regress if a cdc instance restarts.
hasChange := false
if checkpointTs > l.meta.CheckpointTs {
l.meta.CheckpointTs = checkpointTs
hasChange = true
} else if checkpointTs > 0 && checkpointTs != l.meta.CheckpointTs {
log.Panic("flushLogMeta with a regressed checkpoint ts",
log.Warn("flushLogMeta with a regressed checkpoint ts, ignore",
zap.Uint64("currCheckpointTs", l.meta.CheckpointTs),
zap.Uint64("recvCheckpointTs", checkpointTs))
}
if resolvedTs > l.meta.ResolvedTs {
l.meta.ResolvedTs = resolvedTs
hasChange = true
} else if resolvedTs > 0 && resolvedTs != l.meta.ResolvedTs {
log.Panic("flushLogMeta with a regressed resolved ts",
log.Warn("flushLogMeta with a regressed resolved ts, ignore",
zap.Uint64("currCheckpointTs", l.meta.ResolvedTs),
zap.Uint64("recvCheckpointTs", resolvedTs))
}
Expand Down
17 changes: 17 additions & 0 deletions cdc/redo/writer/writer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,23 @@ func TestLogWriterFlushLog(t *testing.T) {
}
}

// checkpoint or meta regress should be ignored correctly.
func TestLogWriterRegress(t *testing.T) {
dir := t.TempDir()
writer, err := NewLogWriter(context.Background(), &LogWriterConfig{
Dir: dir,
ChangeFeedID: model.DefaultChangeFeedID("test-log-writer-regress"),
CaptureID: "cp",
S3Storage: false,
})
require.Nil(t, err)
require.Nil(t, writer.FlushLog(context.Background(), 2, 4))
require.Nil(t, writer.FlushLog(context.Background(), 1, 3))
require.Equal(t, uint64(2), writer.meta.CheckpointTs)
require.Equal(t, uint64(4), writer.meta.ResolvedTs)
_ = writer.Close()
}

func TestNewLogWriter(t *testing.T) {
_, err := NewLogWriter(context.Background(), nil)
require.NotNil(t, err)
Expand Down