Skip to content

Commit e506995

Browse files
authored
fix(blooms): Remove backoff from notify planner (#13506)
1 parent 527510d commit e506995

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

‎pkg/bloombuild/builder/batch.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,12 @@ func (i *blockLoadingIter) loadNext() bool {
303303
// Next implements v1.Iterator.
304304
func (i *blockLoadingIter) Next() bool {
305305
i.init()
306+
307+
if i.ctx.Err() != nil {
308+
i.err = i.ctx.Err()
309+
return false
310+
}
311+
306312
return i.iter.Next() || i.loadNext()
307313
}
308314

‎pkg/bloombuild/builder/builder.go

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -262,22 +262,10 @@ func (b *Builder) notifyTaskCompletedToPlanner(
262262
CreatedMetas: metas,
263263
}
264264

265-
// We have a retry mechanism upper in the stack, but we add another one here
266-
// to try our best to avoid losing the task result.
267-
retries := backoff.New(c.Context(), b.cfg.BackoffConfig)
268-
for retries.Ongoing() {
269-
if err := c.Send(&protos.BuilderToPlanner{
270-
BuilderID: b.ID,
271-
Result: *result.ToProtoTaskResult(),
272-
}); err == nil {
273-
break
274-
}
275-
276-
level.Error(logger).Log("msg", "failed to acknowledge task completion to planner. Retrying", "err", err)
277-
retries.Wait()
278-
}
279-
280-
if err := retries.Err(); err != nil {
265+
if err := c.Send(&protos.BuilderToPlanner{
266+
BuilderID: b.ID,
267+
Result: *result.ToProtoTaskResult(),
268+
}); err != nil {
281269
return fmt.Errorf("failed to acknowledge task completion to planner: %w", err)
282270
}
283271

0 commit comments

Comments
 (0)