From 29c89c496424dbaf66ab8771d1e9c9578eb092a2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 18 Jan 2018 14:53:35 -0500 Subject: [PATCH] rgw: unlink deleted bucket from bucket's owner if a bucket is deleted by an admin/system user instead of its owner, the unlink would fail and the deleted bucket remained visible to the original owner Fixes: http://tracker.ceph.com/issues/22248 Signed-off-by: Casey Bodley (cherry picked from commit 4701e85a3ea72852a61a106724fa22497f3d5789) --- src/rgw/rgw_op.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index b1b19d0c6d8..acb741d128e 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -2941,7 +2941,7 @@ void RGWDeleteBucket::execute() } if (op_ret == 0) { - op_ret = rgw_unlink_bucket(store, s->user->user_id, s->bucket.tenant, + op_ret = rgw_unlink_bucket(store, s->bucket_info.owner, s->bucket.tenant, s->bucket.name, false); if (op_ret < 0) { ldout(s->cct, 0) << "WARNING: failed to unlink bucket: ret=" << op_ret -- 2.47.3