From: Abhishek Varshney <abhishek.varshney@flipkart.com>
Date: Wed, 19 Jul 2017 11:57:08 +0000 (+0000)
Subject: rgw: fix error message in removing bucket with --bypass-gc flag
X-Git-Tag: v12.1.2~222^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16419%2Fhead;p=ceph.git

rgw: fix error message in removing bucket with --bypass-gc flag

Fixes: http://tracker.ceph.com/issues/20688

Signed-off-by: Abhishek Varshney <abhishek.varshney@flipkart.com>
---

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index e8b104509f96..1f2896ea4c10 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1353,7 +1353,12 @@ int RGWBucketAdminOp::remove_bucket(RGWRados *store, RGWBucketAdminOpState& op_s
   if (ret < 0)
     return ret;
 
-  return bucket.remove(op_state, bypass_gc, keep_index_consistent);
+  std::string err_msg;
+  ret = bucket.remove(op_state, bypass_gc, keep_index_consistent, &err_msg);
+  if (!err_msg.empty()) {
+    lderr(store->ctx()) << "ERROR: " << err_msg << dendl;
+  }
+  return ret;
 }
 
 int RGWBucketAdminOp::remove_object(RGWRados *store, RGWBucketAdminOpState& op_state)