From 596b4bc05f167baca3ae6e3ed9bed5b04d27409e Mon Sep 17 00:00:00 2001 From: Abhishek Varshney Date: Wed, 19 Jul 2017 11:57:08 +0000 Subject: [PATCH] rgw: fix error message in removing bucket with --bypass-gc flag Fixes: http://tracker.ceph.com/issues/20688 Signed-off-by: Abhishek Varshney --- src/rgw/rgw_bucket.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index e8b104509f9..1f2896ea4c1 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)