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

Jump to bottom

repl: Improve Flush() to handle BlockWait() timeouts #349

Merged
merged 1 commit into from
Sep 27, 2024
Merged

repl: Improve Flush() to handle BlockWait() timeouts #349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions pkg/repl/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,14 @@ func (c *Client) Flush(ctx context.Context) error {
return err
}
// Wait for canal to catch up before determining if the changeset
// length is considered trivial.
// length is considered trivial. If it can't catch up before the
// timeout is reached (default 10s), it will return an error.
// In which case we are fine to just continue, which will start
// the loop again. After we flush what new changes we discovered here,
// we can try BlockWaiting again.
if err := c.BlockWait(ctx); err != nil {
return err
c.logger.Warnf("error waiting for canal to catch up: %v", err)
continue
}
if c.GetDeltaLen() < binlogTrivialThreshold {
break
Expand Down
Loading