ceph: adds retry to ObjectUser creation
retry ObjectUser creation as long as valid input is provided or it times out. Retry every 15sec for 5min. integration test creates ObjectUser before ObjectStore to ensure that ObjectUser waits for ObjectStore to be created and available Closes: https://github.com/rook/rook/issues/3937 Signed-off-by: Umanga Chapagain <chapagainumanga@gmail.com>
This commit is contained in:
1 parent
1f788cf637
commit
6dd474d6f4
2 files changed
+20
-4
No files matched your search
@@ -191,7 +191,19 @@ func (c *ObjectStoreUserController) createUser(context *clusterd.Context, u *cep
|
||||
|
||||
user, rgwerr, err := object.CreateUser(objContext, userConfig)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create user %s. RadosGW returned error %d: %+v", u.Name, rgwerr, err)
|
||||
pollErr := wait.Poll(time.Second*15, time.Minute*5, func() (ok bool, err error) {
|
||||
user, rgwerr, err = object.CreateUser(objContext, userConfig)
|
||||
if err != nil {
|
||||
if rgwerr == object.RGWErrorBadData {
|
||||
return true, fmt.Errorf("failed to create rgw user %q. error code %d. %+v", u.Name, rgwerr, err)
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
if pollErr != nil {
|
||||
return fmt.Errorf("err or timed out while waiting for objectuser %q to be created. %+v", u.Name, pollErr)
|
||||
}
|
||||
}
|
||||
|
||||
// Store the keys in a secret
|
||||
|
||||
@@ -51,13 +51,17 @@ func runObjectE2ETest(helper *clients.TestClient, k8sh *utils.K8sHelper, s suite
|
||||
logger.Infof("Object Storage End To End Integration Test - Create Object Store, User,Bucket and read/write to bucket")
|
||||
logger.Infof("Running on Rook Cluster %s", namespace)
|
||||
|
||||
logger.Infof("Step 0 : Create Object Store")
|
||||
logger.Infof("Step 0 : Create Object Store User")
|
||||
cosuErr := helper.ObjectUserClient.Create(namespace, userid, userdisplayname, storeName)
|
||||
|
||||
logger.Infof("Step 1 : Create Object Store")
|
||||
cobsErr := helper.ObjectClient.Create(namespace, storeName, 3)
|
||||
|
||||
// check that ObjectStore is created
|
||||
require.Nil(s.T(), cobsErr)
|
||||
logger.Infof("Object store created successfully")
|
||||
|
||||
logger.Infof("Step 1 : Create Object Store User")
|
||||
cosuErr := helper.ObjectUserClient.Create(namespace, userid, userdisplayname, storeName)
|
||||
// check that ObjectUser is created
|
||||
require.Nil(s.T(), cosuErr)
|
||||
logger.Infof("Waiting 10 seconds to ensure user was created")
|
||||
time.Sleep(10 * time.Second)
|
||||
|
||||
Reference in new issue
Block a user