From 76a370a57ab51adfe38cc4a1d57341309ba2f8d3 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Mon, 23 Nov 2020 19:17:16 +0530 Subject: [PATCH] ceph: enhance delete cephObjectStoreUser logging DeleteUser was returning error "failed to delete user ... with buckets" without corresponding buckets information. Now it will check buckets, If buckets are present then return error with buckets info on failure. Signed-off-by: Nitin Goyal --- pkg/operator/ceph/object/user.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkg/operator/ceph/object/user.go b/pkg/operator/ceph/object/user.go index 21d849f2a..2c54c5139 100644 --- a/pkg/operator/ceph/object/user.go +++ b/pkg/operator/ceph/object/user.go @@ -173,6 +173,18 @@ func UpdateUser(c *Context, user ObjectUser) (*ObjectUser, int, error) { return decodeUser(body) } +func ListUserBuckets(c *Context, id string, opts ...string) (string, error) { + + args := []string{"bucket", "list", "--uid", id} + if opts != nil { + args = append(args, opts...) + } + + result, err := runAdminCommand(c, args...) + + return result, errors.Wrapf(err, "failed to list buckets for user uid=%q", id) +} + // DeleteUser deletes the user with the given ID. func DeleteUser(c *Context, id string, opts ...string) (string, error) { args := []string{"user", "rm", "--uid", id} @@ -185,9 +197,14 @@ func DeleteUser(c *Context, id string, opts ...string) (string, error) { if code, ok := exec.ExitStatus(err); ok && code == int(syscall.ENOENT) { return result, nil } + + res, innerErr := ListUserBuckets(c, id) + if innerErr == nil && res != "" && res != "[]" { + return result, errors.Wrapf(err, "s3 user uid=%q have following buckets %q", id, res) + } } - return result, errors.Wrap(err, "failed to delete s3 user") + return result, errors.Wrapf(err, "failed to delete s3 user uid=%q", id) } // SetQuotaUserBucketMax will set maximum bucket quota for a user