[fm] Introduce SitrepGuardedInsert.#10564
Merged
Merged
Conversation
Add the `SitrepGuardedInsert` Diesel combinator and the
`SitrepGuardedResource` trait: a generic primitive for FM rendezvous to
insert a resource row idempotently and guarded against stale-sitrep
execution.
The combinator wraps a caller-supplied resource INSERT in a single CTE
statement that:
- aborts (StaleSitrep) unless the executor's expected generation still
equals the latest sitrep's generation column;
- short-circuits (AlreadyExists) if a creation marker already exists for
the resource id;
- on a successful insert, atomically writes a creation marker, gated by
`WHERE EXISTS (SELECT 1 FROM new_resource)` so a marker is never
fabricated for a pre-existing row.
All spliced SQL identifiers come from the trait's `&'static str` consts, so
the query is injection-safe. The result is surfaced as a
`SitrepGuardedInsertOutcome` of Created / AlreadyExists / StaleSitrep.
mergeconflict
added
the
fault-management
This was referenced Jun 8, 2026
smklein
reviewed
Jun 8, 2026
smklein
approved these changes
Jun 8, 2026
smklein
left a comment
smklein
left a comment
Collaborator
There was a problem hiding this comment.
Remember to hold off on merging until the gate re-opens, but otherwise LGTM
hawkw
pushed a commit
that referenced
this pull request
Jun 10, 2026
Add the `SitrepGuardedInsert` Diesel combinator and the `SitrepGuardedResource` trait: a generic primitive for FM rendezvous to insert a resource row idempotently and guarded against stale-sitrep execution. The combinator wraps a caller-supplied resource INSERT in a single CTE statement that: - aborts (StaleSitrep) unless the executor's expected generation still equals the latest sitrep's generation column; - short-circuits (AlreadyExists) if a creation marker already exists for the resource id; - on a successful insert, atomically writes a creation marker. The result is surfaced as a `SitrepGuardedInsertOutcome` of `Created` / `AlreadyExists` / `StaleSitrep`. Context: #10248. This PR was previously #10532 but I made a mess of it. This is used in #10533 and #10535 which are split out in hopes of making the review somewhat less miserable.
mergeconflict
added a commit
that referenced
this pull request
Jun 12, 2026
The existing tests for `SitrepGuardedInsert` (from #10564) all ran against a single-sitrep history, which can't distinguish "the guard compares against the current sitrep" from "the guard matches any sitrep in history". This change adds a new parent sitrep in a couple places to provide better coverage for the guard's behavior. While we're at it, we also add a brand new test ensuring that we fail closed in the unexpected case where sitrep history is empty.
mergeconflict
added a commit
that referenced
this pull request
Jun 18, 2026
Wire the alert resource through `SitrepGuardedInsert`: - `impl SitrepGuardedResource for Alert`; - schema: `alert_generation` on `fm_sitrep` and the `rendezvous_alert_created` marker table (migration fm-alert-resource-deletion); - `alert_create`'s FM path routes through the combinator, surfacing a stale sitrep as `Error::Conflict`; - `SitrepBuilder` tracks `alert_generation`, bumping it when the outstanding alert-request set changes; the closed-case carry-forward filter drops fully-satisfied closed cases and keeps those with unsatisfied alert requests; - fm_rendezvous reads the expected generation and aborts the alert loop on a stale mismatch; fm_analysis loads existing markers to drive carry-forward; omdb displays the new status fields and generation. Context: #10248, builds on #10564.
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
2 participants
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.
Add the
SitrepGuardedInsertDiesel combinator and theSitrepGuardedResourcetrait: a generic primitive for FM rendezvous to insert a resource row idempotently and guarded against stale-sitrep execution.The combinator wraps a caller-supplied resource INSERT in a single CTE statement that:
The result is surfaced as a
SitrepGuardedInsertOutcomeofCreated/AlreadyExists/StaleSitrep.Context: #10248. This PR was previously #10532 but I made a mess of it. This is used in #10533 and #10535 which are split out in hopes of making the review somewhat less miserable.