mirror of
https://github.com/minio/minio.git
synced 2025-04-16 17:00:07 -04:00
use retry during policy reload from drives (#19307)
This commit is contained in:
parent
b657ffa496
commit
a03dac41eb
@ -379,7 +379,7 @@ func (c *iamCache) policyDBGet(store *IAMStoreSys, name string, isGroup bool) ([
|
|||||||
if ok {
|
if ok {
|
||||||
return policy.toSlice(), policy.UpdatedAt, nil
|
return policy.toSlice(), policy.UpdatedAt, nil
|
||||||
}
|
}
|
||||||
if err := store.loadMappedPolicy(context.TODO(), name, regUser, true, c.iamGroupPolicyMap); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
if err := store.loadMappedPolicyWithRetry(context.TODO(), name, regUser, true, c.iamGroupPolicyMap, 3); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
||||||
return nil, time.Time{}, err
|
return nil, time.Time{}, err
|
||||||
}
|
}
|
||||||
policy = c.iamGroupPolicyMap[name]
|
policy = c.iamGroupPolicyMap[name]
|
||||||
@ -400,7 +400,7 @@ func (c *iamCache) policyDBGet(store *IAMStoreSys, name string, isGroup bool) ([
|
|||||||
// passed here and we lookup the mapping in iamSTSPolicyMap.
|
// passed here and we lookup the mapping in iamSTSPolicyMap.
|
||||||
mp, ok := c.iamUserPolicyMap[name]
|
mp, ok := c.iamUserPolicyMap[name]
|
||||||
if !ok {
|
if !ok {
|
||||||
if err := store.loadMappedPolicy(context.TODO(), name, regUser, false, c.iamUserPolicyMap); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
if err := store.loadMappedPolicyWithRetry(context.TODO(), name, regUser, false, c.iamUserPolicyMap, 3); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
||||||
return nil, time.Time{}, err
|
return nil, time.Time{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -411,7 +411,7 @@ func (c *iamCache) policyDBGet(store *IAMStoreSys, name string, isGroup bool) ([
|
|||||||
mp, ok = c.iamSTSPolicyMap[name]
|
mp, ok = c.iamSTSPolicyMap[name]
|
||||||
if !ok {
|
if !ok {
|
||||||
// Attempt to load parent user mapping for STS accounts
|
// Attempt to load parent user mapping for STS accounts
|
||||||
if err := store.loadMappedPolicy(context.TODO(), name, stsUser, false, c.iamSTSPolicyMap); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
if err := store.loadMappedPolicyWithRetry(context.TODO(), name, stsUser, false, c.iamSTSPolicyMap, 3); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
||||||
return nil, time.Time{}, err
|
return nil, time.Time{}, err
|
||||||
}
|
}
|
||||||
mp = c.iamSTSPolicyMap[name]
|
mp = c.iamSTSPolicyMap[name]
|
||||||
@ -444,7 +444,7 @@ func (c *iamCache) policyDBGet(store *IAMStoreSys, name string, isGroup bool) ([
|
|||||||
|
|
||||||
policy, ok := c.iamGroupPolicyMap[group]
|
policy, ok := c.iamGroupPolicyMap[group]
|
||||||
if ok {
|
if ok {
|
||||||
if err := store.loadMappedPolicy(context.TODO(), group, regUser, true, c.iamGroupPolicyMap); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
if err := store.loadMappedPolicyWithRetry(context.TODO(), group, regUser, true, c.iamGroupPolicyMap, 3); err != nil && !errors.Is(err, errNoSuchPolicy) {
|
||||||
return nil, time.Time{}, err
|
return nil, time.Time{}, err
|
||||||
}
|
}
|
||||||
policy = c.iamGroupPolicyMap[group]
|
policy = c.iamGroupPolicyMap[group]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user