mirror of
https://github.com/pgsty/minio.git
synced 2026-09-22 10:48:25 +03:00
fix: close residual bucket-metadata races (issue #105 audit)
Audit of the three deferred #105 follow-ups. Each reproduces with a deterministic red test in cmd/bucket-metadata-race_test.go, and each fix is the minimal change that turns its test green while preserving the <bucket>.lck -> metadata.lock -> .metadata.bin lock order established by #103. 1. Lifecycle expiry merge lost update (persistent). PeerBucketLCConfigHandler and healBucketILMExpiry read the current lifecycle with an unlocked GetConfigFromDisk, merged the replicated expiry rules with the local transition rules, then wrote the pre-computed blob via Update. Any lifecycle transition change committed between the merge read and the merge write was silently lost. New BucketMetadataSys.UpdateExpiryLCConfig performs the read, merge, and save under one metadata.lock; mergeExpiryWithLCConfig now takes the locked snapshot and validates object-lock retention from it instead of re-reading (avoids a re-entrant metadata load under the lock). 2. DeleteBucket ghost .metadata.bin (persistent). DeleteBucket took only <bucket>.lck while config writers take only metadata.lock, so a writer that was mid-save could re-create .metadata.bin after the prefix purge. The purge now runs under metadata.lock, with a best-effort unlocked fallback so a delete is never blocked from completing. 3. Overlapping peer reloads publishing a stale resident cache (freshness only; the persisted record stays correct). LoadBucketMetadataHandler and the GetConfig cache-miss path published with an unconditional Set, so a reload that read an older revision could overwrite a newer resident record until the next refresh. New BucketMetadataSys.setReloaded (and a matching GetConfig guard) refuses to regress a newer resident record, mirroring refreshBucketsMetadataLoop. Verification: go build -tags kqueue,dev ./...; go vet ./cmd; gofmt clean; rebrand-guard baseline unchanged; go test -tags kqueue,dev ./cmd (207s) green; new tests plus the #103 metadata suite green under -race. Refs #105. Parent #102. Foundation #103. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01L7qJqWwy8oFA6aCXWRzXQe Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
@@ -544,7 +544,9 @@ func (s *peerRESTServer) LoadBucketMetadataHandler(mss *grid.MSS) (np grid.NoPay
|
||||
return np, grid.NewRemoteErr(err)
|
||||
}
|
||||
|
||||
globalBucketMetadataSys.Set(bucketName, meta)
|
||||
// Publish monotonically: an overlapping reload that read an older revision
|
||||
// must not overwrite a newer resident record (issue #105).
|
||||
globalBucketMetadataSys.setReloaded(bucketName, meta)
|
||||
|
||||
if meta.notificationConfig != nil {
|
||||
globalEventNotifier.AddRulesMap(bucketName, meta.notificationConfig.ToRulesMap())
|
||||
|
||||
Reference in New Issue
Block a user