From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 20 Apr 2017 14:50:09 +0000 (+0300)
Subject: rgw: handle correctly when there is no bucket or it doesn't have resharding flag
X-Git-Tag: ses5-milestone6~8^2~7^2~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e43e7f0bb94da40d3d9dbf5eb2acb64b88cbff8;p=ceph.git

rgw: handle correctly when there is no bucket or it doesn't have resharding flag

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index ab7bc8c9c038..909802579bb8 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -311,7 +311,7 @@ int RGWReshard::block_while_resharding(const string& bucket_instance_oid)
 
     ret = cls_rgw_get_bucket_resharding(io_ctx, bucket_instance_oid,
 					entry, resharding);
-    if (ret < 0) {
+    if (ret < 0 && ret != -ENOENT && ret != -ENODATA) {
       ldout(cct, 0) << "RGWReshard::" << __func__ << " ERROR: failed to get bucket resharding :"  <<
 	cpp_strerror(-ret)<< dendl;
       return ret;