fix(quota): make the claim gate atomic, and stop zeroing the storage cache
Two defects in the §9.3 quota path, both invisible to the hermetic suite: - Audit #4's TOCTOU was real and documented: QuotaCheck and ClaimServer were separate statements, so two concurrent claims by one user for two different ownerless servers both read count < max_servers and both won. The gate now lives inside ClaimServer, in the SAME transaction as the ownership write, under pg_advisory_xact_lock(hashtext(user_id)) — the aggregate read, the four-dimension re-check (shared with QuotaCheck via one helper so the two cannot drift), and the UPDATE are one serialized decision. The loser gets ErrQuotaExceeded, which both claim handlers map to the same 403 the sequential path gives; the server row is additionally taken FOR UPDATE so same-server races still resolve to exactly one winner. - The server PATCH path called UpdateServerResources(..., 0) for storage even though a resources patch cannot change storage. The cached columns are the ONLY input to the quota aggregate, so every resource patch silently dropped that server's storage contribution from its owner's cap. The handler now reads the current spec and passes storage through. Red-then-green: the new pgint test drives two real concurrent claims against max_servers=1 (before: both win; now: exactly one win + one gated 403, and the DB shows one owned row); the hermetic suite pins the 403 mapping and the storage-preserving cache write.
This commit is contained in:
8 files changed
+274
-50
No files matched your search
@@ -127,6 +127,26 @@ func TestPatchServerMemoryOverride(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestPatchServerPreservesStorageCache pins the storage dimension of the quota
|
||||
// aggregate: a resources patch cannot change storage, so the cached storage
|
||||
// must survive it — passing 0 would silently zero the owner's aggregate (the
|
||||
// cached columns are QuotaCheck's only input) from that patch onward.
|
||||
func TestPatchServerPreservesStorageCache(t *testing.T) {
|
||||
api, repo, _, _ := newPatchAPI()
|
||||
repo.byName["survival"].OwnerID = "u1"
|
||||
repo.quota["u1"] = true
|
||||
repo.serverResources["survival"] = ResourceSpec{StorageMB: 10240}
|
||||
|
||||
w := patchSurvival(api, `{"memory":"2Gi","resources":{"memory":"4Gi","cpu":"2"}}`)
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("code = %d, want 200 (%s)", w.Code, w.Body.String())
|
||||
}
|
||||
got := repo.resourceUpdates["survival"]
|
||||
if got.CPUMilli != 2000 || got.MemoryMB != 4096 || got.StorageMB != 10240 {
|
||||
t.Fatalf("resource cache = %+v, want cpu 2000 / mem 4096 / storage preserved 10240", got)
|
||||
}
|
||||
}
|
||||
|
||||
// TestPatchServerRejections is the validation matrix: each malformed request is
|
||||
// rejected with the right status and stable error code, and (critically) NOTHING
|
||||
// reaches the cluster on a rejection — the analog of create's "no CRD written".
|
||||
|
||||
Reference in new issue
Block a user