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 1fcdba04c65e4337cb42f1c49469b67f65b7295d..d2b459999df241a4098b3a4ee29be8e5f108fb11 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -6093,7 +6093,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;