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

fix(blooms): Remove backoff from notify planner #13506

Merged
merged 1 commit into from
Jul 15, 2024
Merged

fix(blooms): Remove backoff from notify planner #13506

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions pkg/bloombuild/builder/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,12 @@ func (i *blockLoadingIter) loadNext() bool {
// Next implements v1.Iterator.
func (i *blockLoadingIter) Next() bool {
i.init()

if i.ctx.Err() != nil {
i.err = i.ctx.Err()
return false
}

return i.iter.Next() || i.loadNext()
}

Expand Down
20 changes: 4 additions & 16 deletions pkg/bloombuild/builder/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,22 +262,10 @@ func (b *Builder) notifyTaskCompletedToPlanner(
CreatedMetas: metas,
}

// We have a retry mechanism upper in the stack, but we add another one here
// to try our best to avoid losing the task result.
retries := backoff.New(c.Context(), b.cfg.BackoffConfig)
for retries.Ongoing() {
if err := c.Send(&protos.BuilderToPlanner{
BuilderID: b.ID,
Result: *result.ToProtoTaskResult(),
}); err == nil {
break
}

level.Error(logger).Log("msg", "failed to acknowledge task completion to planner. Retrying", "err", err)
retries.Wait()
}

if err := retries.Err(); err != nil {
if err := c.Send(&protos.BuilderToPlanner{
BuilderID: b.ID,
Result: *result.ToProtoTaskResult(),
}); err != nil {
return fmt.Errorf("failed to acknowledge task completion to planner: %w", err)
}

Expand Down
Loading