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

br: fix Log Backup unexpected paused when adding a already long-running task (#53695) #53948

Merged
merged 6 commits into from
Jul 18, 2024
Merged

br: fix Log Backup unexpected paused when adding a already long-running task (#53695) #53948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae93c5f
This is an automated cherry-pick of #53695
RidRisR Jun 11, 2024
107e2b8
fix
RidRisR Jun 24, 2024
753c2cb
fix bazel
RidRisR Jul 8, 2024
3e3b151
Merge branch 'release-7.1' into cherry-pick-53695-to-release-7.1
RidRisR Jul 8, 2024
ef6c28c
fiz bazel
RidRisR Jul 17, 2024
83761f0
update
RidRisR Jul 17, 2024
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
2 changes: 1 addition & 1 deletion br/pkg/streamhelper/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ go_test(
],
flaky = True,
race = "on",
shard_count = 28,
shard_count = 32,
deps = [
":streamhelper",
"//br/pkg/errors",
Expand Down
13 changes: 11 additions & 2 deletions br/pkg/streamhelper/advancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,17 @@ func (c *CheckpointAdvancer) onTaskEvent(ctx context.Context, e TaskEvent) error
c.task = e.Info
c.taskRange = spans.Collapse(len(e.Ranges), func(i int) kv.KeyRange { return e.Ranges[i] })
c.setCheckpoints(spans.Sorted(spans.NewFullWith(e.Ranges, 0)))
c.lastCheckpoint = newCheckpointWithTS(e.Info.StartTs)
p, err := c.env.BlockGCUntil(ctx, c.task.StartTs)
globalCheckpointTs, err := c.env.GetGlobalCheckpointForTask(ctx, e.Name)
if err != nil {
log.Error("failed to get global checkpoint, skipping.", logutil.ShortError(err))
return err
}
if globalCheckpointTs < c.task.StartTs {
globalCheckpointTs = c.task.StartTs
}
log.Info("get global checkpoint", zap.Uint64("checkpoint", globalCheckpointTs))
c.lastCheckpoint = newCheckpointWithTS(globalCheckpointTs)
p, err := c.env.BlockGCUntil(ctx, globalCheckpointTs)
if err != nil {
log.Warn("failed to upload service GC safepoint, skipping.", logutil.ShortError(err))
}
Expand Down
2 changes: 2 additions & 0 deletions br/pkg/streamhelper/advancer_env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ type StreamMeta interface {
Begin(ctx context.Context, ch chan<- TaskEvent) error
// UploadV3GlobalCheckpointForTask uploads the global checkpoint to the meta store.
UploadV3GlobalCheckpointForTask(ctx context.Context, taskName string, checkpoint uint64) error
// GetGlobalCheckpointForTask gets the global checkpoint from the meta store.
GetGlobalCheckpointForTask(ctx context.Context, taskName string) (uint64, error)
// ClearV3GlobalCheckpointForTask clears the global checkpoint to the meta store.
ClearV3GlobalCheckpointForTask(ctx context.Context, taskName string) error
PauseTask(ctx context.Context, taskName string) error
Expand Down
Loading