fix(reshard): fence maintenance through direct primary - #1015
Merged
Conversation
Test Impact PlanDeterministic summary of how this PR changes tests, CI runners, and coverage-risk signals. Summary
Signals
Coverage risk: neutral or increased No coverage-reduction warnings detected. |
bill-ph
marked this pull request as ready for review
July 30, 2026 11:16
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
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.
Summary
NOLOGIN, then close the direct backend instead of returning it to PgBouncerRoot cause
The maintenance cleanup path connected through the shard's session-mode PgBouncer pool.
pgx.Connectcould establish the frontend before PgBouncer authenticated a PostgreSQL backend; after the maintenance role becameNOLOGIN, the first SQL statement could fail with PgBouncer's cachedserver_login_retryerror.Merely forcing PgBouncer to assign a backend was incomplete: closing that frontend returns its still-authenticated backend to the pool, where a stale client with the operation credential could reuse it after
NOLOGIN.The final cleanup session now uses the source shard's direct
-rwendpoint while retaining the operation-scoped maintenance username/password. It terminates every other maintenance-role backend and then closes its own direct PostgreSQL connection, leaving no authenticated backend for PgBouncer to recycle.Endpoint resolution happens before any takeover re-enables a previously disabled role and has a separate timeout from the final disable/drain transition.
Reproduction
Validation
NOLOGINNOLOGINstate when resolution failscontrolplane/provisionersuitejust lint