From f074c12c4d1c655d38cd1599afeb0ffa74cd3086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 9 Jul 2021 15:57:19 +0200 Subject: [PATCH] ceph: get the s3 user first instead of create MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Rados Gateway Admin OPS API has changed its behavior from Nautilus to Pacific. Calling user create on an existing user wil generate additional keys to the user on Nautilus. Where in Pacific it will report an error with UserAlreadyExists. So to handle both scenarios, let's first get the user, and if the user does not exist (NoSuchUser) we then create it. Signed-off-by: Sébastien Han --- pkg/operator/ceph/object/bucket/rgw-handlers.go | 12 ++++++++++-- pkg/operator/ceph/object/health.go | 10 +++++----- pkg/operator/ceph/object/user/controller.go | 14 +++++++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/pkg/operator/ceph/object/bucket/rgw-handlers.go b/pkg/operator/ceph/object/bucket/rgw-handlers.go index 847d95f12..b43b14171 100644 --- a/pkg/operator/ceph/object/bucket/rgw-handlers.go +++ b/pkg/operator/ceph/object/bucket/rgw-handlers.go @@ -49,9 +49,17 @@ func (p *Provisioner) createCephUser(username string) (accKey string, secKey str DisplayName: p.cephUserName, } - u, err := p.adminOpsClient.CreateUser(context.TODO(), userConfig) + var u admin.User + u, err = p.adminOpsClient.GetUser(context.TODO(), userConfig) if err != nil { - return "", "", errors.Wrapf(err, "failed to create ceph user %q: %v", username, err) + if errors.Is(err, admin.ErrNoSuchUser) { + u, err = p.adminOpsClient.CreateUser(context.TODO(), userConfig) + if err != nil { + return "", "", errors.Wrapf(err, "failed to create ceph object user %v", userConfig.ID) + } + } else { + return "", "", errors.Wrapf(err, "failed to get ceph user %q", username) + } } logger.Infof("successfully created Ceph user %q with access keys", username) diff --git a/pkg/operator/ceph/object/health.go b/pkg/operator/ceph/object/health.go index 6bdbea754..1078a3c17 100644 --- a/pkg/operator/ceph/object/health.go +++ b/pkg/operator/ceph/object/health.go @@ -146,15 +146,15 @@ func (c *bucketChecker) checkObjectStoreHealth() error { // Create checker user logger.Debugf("creating s3 user object %q for object store %q health check", userConfig.ID, c.namespacedName.Name) var user admin.User - user, err := c.objContext.AdminOpsClient.CreateUser(context.TODO(), userConfig) + user, err := c.objContext.AdminOpsClient.GetUser(context.TODO(), userConfig) if err != nil { - if errors.Is(err, admin.ErrUserExists) { - user, err = c.objContext.AdminOpsClient.GetUser(context.TODO(), userConfig) + if errors.Is(err, admin.ErrNoSuchUser) { + user, err = c.objContext.AdminOpsClient.CreateUser(context.TODO(), userConfig) if err != nil { - return errors.Wrapf(err, "failed to get details from ceph object user %q", userConfig.ID) + return errors.Wrapf(err, "failed to create from ceph object user %v", userConfig.ID) } } else { - return errors.Wrapf(err, "failed to create ceph object user %q", userConfig.ID) + return errors.Wrapf(err, "failed to get details from ceph object user %q", userConfig.ID) } } diff --git a/pkg/operator/ceph/object/user/controller.go b/pkg/operator/ceph/object/user/controller.go index f477a1124..a3a92b09b 100644 --- a/pkg/operator/ceph/object/user/controller.go +++ b/pkg/operator/ceph/object/user/controller.go @@ -270,19 +270,19 @@ func (r *ReconcileObjectStoreUser) reconcileCephUser(cephObjectStoreUser *cephv1 func (r *ReconcileObjectStoreUser) createorUpdateCephUser(u *cephv1.CephObjectStoreUser) error { logger.Infof("creating ceph object user %q in namespace %q", u.Name, u.Namespace) - logCreateOrUpdate := fmt.Sprintf("created ceph object user %q", u.Name) + logCreateOrUpdate := fmt.Sprintf("retrieved existing ceph object user %q", u.Name) var user admin.User var err error - user, err = r.objContext.AdminOpsClient.CreateUser(context.TODO(), *r.userConfig) + user, err = r.objContext.AdminOpsClient.GetUser(context.TODO(), *r.userConfig) if err != nil { - if errors.Is(err, admin.ErrUserExists) { - user, err = r.objContext.AdminOpsClient.GetUser(context.TODO(), *r.userConfig) + if errors.Is(err, admin.ErrNoSuchUser) { + user, err = r.objContext.AdminOpsClient.CreateUser(context.TODO(), *r.userConfig) if err != nil { - return errors.Wrapf(err, "failed to get details from ceph object user %v", &r.userConfig.ID) + return errors.Wrapf(err, "failed to create ceph object user %v", &r.userConfig.ID) } - logCreateOrUpdate = fmt.Sprintf("retrieved existing ceph object user %q", u.Name) + logCreateOrUpdate = fmt.Sprintf("created ceph object user %q", u.Name) } else { - return errors.Wrapf(err, "failed to create ceph object user %q", u.Name) + return errors.Wrapf(err, "failed to get details from ceph object user %q", u.Name) } }