MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-23 04:33:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: SR: Add more info when IAM config differs (#18302)

Browse Source 
Provide details on what IAM info mismatched when the validation fails
This commit is contained in:
Aditya Manthramurthy 2023-10-23 21:16:40 -07:00 committed by GitHub
parent 5c8339e1e8
commit 0a284a1a10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 131 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/api-errors.go
View File

@ -310,6 +310,7 @@ const (
ErrSiteReplicationBucketMetaError ErrSiteReplicationBucketMetaError
ErrSiteReplicationIAMError ErrSiteReplicationIAMError
ErrSiteReplicationConfigMissing ErrSiteReplicationConfigMissing
ErrSiteReplicationIAMConfigMismatch
// Pool rebalance errors // Pool rebalance errors
ErrAdminRebalanceAlreadyStarted ErrAdminRebalanceAlreadyStarted
@ -1512,6 +1513,11 @@ var errorCodes = errorCodeMap{
Description: "Site not found in site replication configuration", Description: "Site not found in site replication configuration",
HTTPStatusCode: http.StatusBadRequest, HTTPStatusCode: http.StatusBadRequest,
}, },
ErrSiteReplicationIAMConfigMismatch: {
Code: "XMinioSiteReplicationIAMConfigMismatch",
Description: "IAM configuration mismatch between sites",
HTTPStatusCode: http.StatusBadRequest,
},
ErrAdminRebalanceAlreadyStarted: { ErrAdminRebalanceAlreadyStarted: {
Code: "XMinioAdminRebalanceAlreadyStarted", Code: "XMinioAdminRebalanceAlreadyStarted",
Description: "Pool rebalance is already started", Description: "Pool rebalance is already started",

221
cmd/apierrorcode_string.go
View File

File diff suppressed because one or more lines are too long

23
cmd/site-replication.go
View File

@ -154,6 +154,13 @@ func errSRConfigMissingError(err error) SRError {
} }
} }
func errSRIAMConfigMismatch(peer1, peer2 string, s1, s2 madmin.IDPSettings) SRError {
return SRError{
Cause: fmt.Errorf("IAM/IDP settings mismatch between %s and %s: %#v vs %#v", peer1, peer2, s1, s2),
Code: ErrSiteReplicationIAMConfigMismatch,
}
}
var errSRObjectLayerNotReady = SRError{ var errSRObjectLayerNotReady = SRError{
Cause: fmt.Errorf("object layer not ready"), Cause: fmt.Errorf("object layer not ready"),
Code: ErrServerNotInitialized, Code: ErrServerNotInitialized,
@ -424,13 +431,10 @@ func (c *SiteReplicationSys) AddPeerClusters(ctx context.Context, psites []madmi
} }
// validate that all clusters are using the same IDP settings. // validate that all clusters are using the same IDP settings.
pass, err := c.validateIDPSettings(ctx, sites) err = c.validateIDPSettings(ctx, sites)
if err != nil { if err != nil {
return madmin.ReplicateAddStatus{}, err return madmin.ReplicateAddStatus{}, err
} }
if !pass {
return madmin.ReplicateAddStatus{}, errSRInvalidRequest(errors.New("all cluster sites must have the same IAM/IDP settings"))
}
// For this `add` API, either all clusters must be empty or the local // For this `add` API, either all clusters must be empty or the local
// cluster must be the only one having some buckets. // cluster must be the only one having some buckets.
@ -619,7 +623,7 @@ func (c *SiteReplicationSys) GetIDPSettings(ctx context.Context) madmin.IDPSetti
return s return s
} }
func (c *SiteReplicationSys) validateIDPSettings(ctx context.Context, peers []PeerSiteInfo) (bool, error) { func (c *SiteReplicationSys) validateIDPSettings(ctx context.Context, peers []PeerSiteInfo) error {
s := make([]madmin.IDPSettings, 0, len(peers)) s := make([]madmin.IDPSettings, 0, len(peers))
for _, v := range peers { for _, v := range peers {
if v.self { if v.self {
@ -629,22 +633,23 @@ func (c *SiteReplicationSys) validateIDPSettings(ctx context.Context, peers []Pe
admClient, err := getAdminClient(v.Endpoint, v.AccessKey, v.SecretKey) admClient, err := getAdminClient(v.Endpoint, v.AccessKey, v.SecretKey)
if err != nil { if err != nil {
return false, errSRPeerResp(fmt.Errorf("unable to create admin client for %s: %w", v.Name, err)) return errSRPeerResp(fmt.Errorf("unable to create admin client for %s: %w", v.Name, err))
} }
is, err := admClient.SRPeerGetIDPSettings(ctx) is, err := admClient.SRPeerGetIDPSettings(ctx)
if err != nil { if err != nil {
return false, errSRPeerResp(fmt.Errorf("unable to fetch IDP settings from %s: %v", v.Name, err)) return errSRPeerResp(fmt.Errorf("unable to fetch IDP settings from %s: %v", v.Name, err))
} }
s = append(s, is) s = append(s, is)
} }
for i := 1; i < len(s); i++ { for i := 1; i < len(s); i++ {
if !reflect.DeepEqual(s[i], s[0]) { if !reflect.DeepEqual(s[i], s[0]) {
return false, nil return errSRIAMConfigMismatch(peers[0].Name, peers[i].Name, s[0], s[i])
} }
} }
return true, nil
return nil
} }
// Netperf for site-replication net perf // Netperf for site-replication net perf