Adding a tier locks pools in creation order, while other paths sort them by pool id #194

New Issue

2026-10-07T08:00:29Z

cgalo5758 commented

2026-10-07 08:00:29 +00:00

CreatePlanLadderTier (internal/server/operator_plan_ladders.go) aligns every live provision of the new tier's product inside one transaction, in the order GetLivePoolProvisionsByProductID returns them, which is creation order. Each core.align_conferral_shape call locks that provision's pool row, so the transaction locks several pools in creation order. The rule-change commit and tier removal lock the pools they touch in ascending pool_id order, and docs/database-locks.md states that order as the rule.

Two transactions that lock an overlapping set of pools in different orders can deadlock: a tier add and a tier removal, for example, when two organizations hold both tiers' products. Postgres then aborts one of them, and the operator's act fails for a reason they cannot act on. No row is left half written.

Done when: tier add locks the pools it will touch in ascending pool_id order before it aligns any of them, as tier removal does, and the tier-add entry under "Where the paths differ" in docs/database-locks.md is gone. #186 moves the pool lock into one helper; this issue is only about the order.

`CreatePlanLadderTier` (`internal/server/operator_plan_ladders.go`) aligns every live provision of the new tier's product inside one transaction, in the order `GetLivePoolProvisionsByProductID` returns them, which is creation order. Each `core.align_conferral_shape` call locks that provision's pool row, so the transaction locks several pools in creation order. The rule-change commit and tier removal lock the pools they touch in ascending `pool_id` order, and `docs/database-locks.md` states that order as the rule. Two transactions that lock an overlapping set of pools in different orders can deadlock: a tier add and a tier removal, for example, when two organizations hold both tiers' products. Postgres then aborts one of them, and the operator's act fails for a reason they cannot act on. No row is left half written. Done when: tier add locks the pools it will touch in ascending `pool_id` order before it aligns any of them, as tier removal does, and the tier-add entry under "Where the paths differ" in `docs/database-locks.md` is gone. #186 moves the pool lock into one helper; this issue is only about the order.

cgalo5758 added the

kind

bug

area/entitlements area/catalog labels 2026-10-07 08:00:29 +00:00

cgalo5758 referenced this issue

2026-10-09 03:50:02 +00:00

Recording a failed drain locks the obligation before the pool, while the drain locks the pool first #196

cgalo5758 referenced this issue

2026-10-10 23:59:47 +00:00

Adding, deleting or reordering tiers while the entitlement lock is held answers "see server logs" instead of the refusal that says to try again #216

Sign in to join this conversation.