From b7bc51ea69aabd9b35bfc5485e582ea80d3203ee Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Mon, 28 Sep 2020 19:58:22 +0530 Subject: [PATCH] ceph: remove user unlink while deleting OBC User unlink is performed just before deleting OBC resources. Since user is internal to OBC and next to remove to delete user, unlinking user is not necessary. Fixes: 6300 Signed-off-by: Jiffin Tony Thottan --- pkg/operator/ceph/object/bucket/provisioner.go | 5 ----- pkg/operator/ceph/object/user.go | 14 -------------- 2 files changed, 19 deletions(-) diff --git a/pkg/operator/ceph/object/bucket/provisioner.go b/pkg/operator/ceph/object/bucket/provisioner.go index 8175c321c..0c50f4522 100644 --- a/pkg/operator/ceph/object/bucket/provisioner.go +++ b/pkg/operator/ceph/object/bucket/provisioner.go @@ -203,11 +203,6 @@ func (p Provisioner) Delete(ob *bktv1alpha1.ObjectBucket) error { } logger.Infof("Delete: deleting bucket %q for OB %q", p.bucketName, ob.Name) - _, _, err = cephObject.UnlinkUser(p.objectContext, p.cephUserName, p.bucketName) - if err != nil { - return err - } - if err := p.deleteOBCResource(p.bucketName); err != nil { return errors.Wrapf(err, "error deleting OBCResource bucket %q", p.bucketName) } diff --git a/pkg/operator/ceph/object/user.go b/pkg/operator/ceph/object/user.go index 81e00ab4b..21d849f2a 100644 --- a/pkg/operator/ceph/object/user.go +++ b/pkg/operator/ceph/object/user.go @@ -224,20 +224,6 @@ func LinkUser(c *Context, id, bucket string) (string, int, error) { return result, RGWErrorNone, nil } -// UnlinkUser will unlink the user from a bucket -func UnlinkUser(c *Context, id, bucket string) (string, int, error) { - logger.Infof("Unlinking (user: %s) (bucket: %s)", id, bucket) - args := []string{"bucket", "unlink", "--uid", id, "--bucket", bucket} - result, err := runAdminCommand(c, args...) - if err != nil { - return "", RGWErrorUnknown, err - } - if strings.Contains(result, "bucket entry point user mismatch") { - return "", RGWErrorNotFound, err - } - return result, RGWErrorNone, nil -} - // EnableUserQuota will allows to enable quota defined for a user func EnableUserQuota(c *Context, id string) (string, error) { logger.Debug("Enabling user quota for %q", id)