From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 18 May 2017 19:48:28 +0000 (+0300)
Subject: rgw: check for bucket resharding  when adding an object
X-Git-Tag: v12.1.0~276^2~37
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e03b85e987f22707725585501e642c862fbbf104;p=ceph-ci.git

rgw: check for bucket resharding  when adding an object

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index d4a9326c3dd..cc9f290ecad 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -3118,6 +3118,16 @@ void RGWPutObj::execute()
       ldout(s->cct, 20) << "check_quota() returned ret=" << op_ret << dendl;
       goto done;
     }
+    bool need_resharding = false;
+    op_ret = store->check_bucket_shards(s->bucket_owner.get_id(), s->bucket,
+					bucket_quota, s->bucket_info.num_shards, need_resharding);
+    if (op_ret < 0) {
+      ldout(s->cct, 20) << "check_bucket_shards() returned ret=" << op_ret << dendl;
+      goto done;
+    } else if (need_resharding) {
+      /* Add to resharding queue */
+      ldout(s->cct, 20) << s->bucket << " needs resharding " << dendl;
+    }
   }
 
   if (supplied_etag) {