From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 11 Mar 2019 14:09:03 +0000 (+0100)
Subject: rgw admin: add tenant argument to reshard cancel
X-Git-Tag: v14.2.2~137^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0ba53a9e7e42db5a7d88b9bfd81a4dabc7bd615;p=ceph.git

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 51b6178e4fbd..9e5499d39eac 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -6359,7 +6359,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;