feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

ceph: remove user unlink while deleting OBC

Browse Source 
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 <thottanjiffin@gmail.com>
This commit is contained in:
Jiffin Tony Thottan
2020-09-29 17:20:54 +05:30
parent e14f00f028
commit b7bc51ea69
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/object/bucket/provisioner.go
-5
View File
@@ -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)
}
pkg/operator/ceph/object/user.go
-14
View File
@@ -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)