ref(hybridcloud): Require the claim's deadline and mailbox on drains - #123275
Open
vaind wants to merge 4 commits into
Open
ref(hybridcloud): Require the claim's deadline and mailbox on drains#123275vaind wants to merge 4 commits into
vaind wants to merge 4 commits into
Conversation
github-actions
Bot
added
the
Scope: Backend
vaind
force-pushed
the
ivan/webhook-drain-required-claim
branch
from
August 31, 2026 22:56
99bdea8 to
66b93b7
Compare
The transitional fallbacks from the drain-claim work come out: valid_until and mailbox are now required, so _begin_drain reduces to building the claim and asking whether it lapsed — no head-row read and no nullable mailbox downstream. The drain_mailbox_parallel alias goes with them; dispatch has not enqueued it since the drains merged. Must deploy at least one deploy after the wire flip: a drain enqueued before dispatch sent the claim carries neither argument and now raises TypeError. That failure is noisy rather than lossy — the rows keep their claim's schedule_for and the next dispatcher re-claims them once it passes.
vaind
force-pushed
the
ivan/webhook-drain-required-claim
branch
from
August 31, 2026 23:05
66b93b7 to
5cfdccd
Compare
Contributor
Sentry Snapshot Testing
|
vaind
marked this pull request as ready for review
August 31, 2026 23:08
…ain-required-claim
…ain-required-claim
…ain-required-claim # Conflicts: # src/sentry/hybridcloud/tasks/deliver_webhooks.py # tests/sentry/hybridcloud/tasks/test_deliver_webhooks.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Last of the drain-claim stack (on the chain-dispatch PR, which stacks on #122893).
Change
The transitional fallbacks come out:
valid_untilandmailboxare required ondrain_mailbox, so_begin_drainreduces to building the claim and asking whether it has lapsed — no head-row read, no nullable mailbox anywhere downstream.drain_mailbox_parallelis deleted. Dispatch has not enqueued it since the drains merged; it only served in-flight tasks from the deploy before that.valid_until,mailbox) explicitly.Deploy at least one deploy after the wire flip (the chain-dispatch PR) and let its pre-existing drains clear first. A drain enqueued before dispatch sent the claim carries neither argument and raises
TypeErrorhere; the taskbroker discards it, the rows keep theschedule_fortheir claim wrote, and the next dispatcher re-claims them once it passes — delivery delayed by up to the claim horizon, not dropped.Follow-up enabled by this
With
valid_untilalways the claim's written value,next_slicefiltering onschedule_for = valid_untilwould become a true ownership fetch and could subsume the first-slice head check — left out here to keep this PR pure removal.