mirror of
https://github.com/pgsty/minio.git
synced 2026-10-30 20:41:03 +03:00
fix(replication): recover physical creation time and align policy status
An independent adversarial review of the bucket metadata convergence work found three defects it had introduced. GetBucketInfo overwrote the physical creation probe with cached metadata, which a bucket that never held a configuration legitimately lacks. The new creation-time requirement then failed every policy, tag, SSE, quota, versioning and Object Lock write on such a bucket, with no operator recovery path, and initial synchronization skipped it silently. Return the physical result unchanged when metadata is not requested, as ListBuckets already does, recover the time during initial synchronization, and pass it to MakeBucketHook so peers adopt the same bucket generation. Replication status compared parsed policies statement by statement while heal compares the canonical key. An upgraded peer that stored an equivalent statement order was therefore reported as mismatched forever, and heal never had anything to write. Compare the key heal compares; per-site presence counting is unchanged. Heal diagnostics shared one log key across four conditions, so a real peer RPC failure could be deduplicated away by an earlier message, and they were logged at error level for the normal transient of a peer that does not have the bucket yet. Give each reason its own key at warning level, report only a field state that exists and still cannot be ordered, and diagnose nothing when no site holds a state to propagate. The recovery test now runs against the real ObjectLayer; the stub it replaced returned the expected time and hid the defect. The policy status test uses a statement order the canonical encoder reorders, and adoption coverage is extended past a real field time. Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
+16
-8
@@ -819,6 +819,9 @@ func (c *SiteReplicationSys) MakeBucketHook(ctx context.Context, bucket string,
|
||||
optsMap["forceCreate"] = "true"
|
||||
}
|
||||
createdAt, _ := globalBucketMetadataSys.CreatedAt(bucket)
|
||||
if createdAt.IsZero() {
|
||||
createdAt = opts.CreatedAt
|
||||
}
|
||||
optsMap["createdAt"] = createdAt.UTC().Format(time.RFC3339Nano)
|
||||
opts.CreatedAt = createdAt
|
||||
|
||||
@@ -2139,10 +2142,14 @@ func (c *SiteReplicationSys) syncToAllPeers(ctx context.Context, addOpts madmin.
|
||||
if err != nil && !errors.Is(err, errConfigNotFound) {
|
||||
return errSRBackendIssue(err)
|
||||
}
|
||||
if err := ensureBucketMetadataCreated(ctx, objAPI, &meta); err != nil {
|
||||
logBucketConfigReplication(ctx, bucket, "initial-sync", "indeterminate", time.Time{}, meta.Created, err.Error())
|
||||
return errSRBackendIssue(err)
|
||||
}
|
||||
|
||||
opts := MakeBucketOptions{
|
||||
LockEnabled: meta.ObjectLocking(),
|
||||
CreatedAt: bucketInfo.Created.UTC(),
|
||||
CreatedAt: meta.Created.UTC(),
|
||||
}
|
||||
|
||||
// Now call the MakeBucketHook on existing bucket - this will
|
||||
@@ -3784,18 +3791,19 @@ func isBktPolicyReplicated(total int, policies []*policy.BucketPolicy) bool {
|
||||
return false
|
||||
}
|
||||
// check if policies match between sites
|
||||
var prev *policy.BucketPolicy
|
||||
for i, p := range policies {
|
||||
var prev []byte
|
||||
first := true
|
||||
for _, p := range policies {
|
||||
if p == nil {
|
||||
continue
|
||||
}
|
||||
if i == 0 {
|
||||
prev = p
|
||||
continue
|
||||
}
|
||||
if !prev.Equals(*p) {
|
||||
// Heal treats statement/set permutations as the same effective state.
|
||||
// Status must agree even when an upgraded peer retains legacy bytes.
|
||||
key, err := canonicalBucketPolicy(p)
|
||||
if err != nil || !first && !bytes.Equal(prev, key) {
|
||||
return false
|
||||
}
|
||||
prev, first = key, false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user