rgw admin: add tenant argument to reshard cancel

Looks like we ignore the tenant argument for reshard cancel as mentioned in the
issue.

Fixes: https://tracker.ceph.com/issues/38214
Reported-by: Ed Fisher <ed@debacle.org>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit ff64af392429ebb4e601f048307ff744cefaaa43)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 1bd89a59a1e538353bccddccc24d7730402155f7..2070c9ffcee228d063d206f42516629d61746912 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -6269,7 +6269,7 @@ next:
     RGWReshard reshard(store);
 
     cls_rgw_reshard_entry entry;
-    //entry.tenant = tenant;
+    entry.tenant = tenant;
     entry.bucket_name = bucket_name;
     //entry.bucket_id = bucket_id;