From 6dd474d6f4bd2a7adf8b64f311aecd590fe324bc Mon Sep 17 00:00:00 2001 From: Umanga Chapagain Date: Wed, 23 Oct 2019 12:19:22 +0530 Subject: [PATCH] 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 --- pkg/operator/ceph/object/user/controller.go | 14 +++++++++++++- tests/integration/ceph_base_object_test.go | 10 +++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkg/operator/ceph/object/user/controller.go b/pkg/operator/ceph/object/user/controller.go index 801aa24d5..1e3b63b4a 100644 --- a/pkg/operator/ceph/object/user/controller.go +++ b/pkg/operator/ceph/object/user/controller.go @@ -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 diff --git a/tests/integration/ceph_base_object_test.go b/tests/integration/ceph_base_object_test.go index 4c9dff33e..312e55d0a 100644 --- a/tests/integration/ceph_base_object_test.go +++ b/tests/integration/ceph_base_object_test.go @@ -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)