Skip to content

Commit

Permalink
Merge pull request #121733 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-24.1-121560

release-24.1: admission: include context error in work queue log
  • Loading branch information
aadityasondhi authored Apr 4, 2024
2 parents d2ac826 + e3dab11 commit da7c11b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/util/admission/work_queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ func (q *WorkQueue) Admit(ctx context.Context, info WorkInfo) (enabled bool, err
q.metrics.incErrored(info.Priority)
deadline, _ := ctx.Deadline()
return true,
errors.Newf("work %s deadline already expired: deadline: %v, now: %v",
errors.Wrapf(ctx.Err(), "work %s context canceled before queueing: deadline: %v, now: %v",
q.workKind, deadline, startTime)
}
// Push onto heap(s).
Expand Down

0 comments on commit da7c11b

Please sign in to comment.