From: Orit Wasserman <owasserm@redhat.com>
Date: Fri, 19 May 2017 11:02:17 +0000 (+0300)
Subject: rgw: add bucket to resharding queue if needs resharding
X-Git-Tag: ses5-milestone6~8^2~7^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45ad93ddee61b9baaa28542c988fbc3dc014e210;p=ceph.git

rgw: add bucket to resharding queue if needs resharding

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

diff --git a/src/rgw/rgw_quota.cc b/src/rgw/rgw_quota.cc
index 55dc64a0a72c..212ec4ba9dd3 100644
--- a/src/rgw/rgw_quota.cc
+++ b/src/rgw/rgw_quota.cc
@@ -952,7 +952,7 @@ public:
     }
 
     if (bucket_stats.num_objects  + num_objs > num_shards * max_objs_per_shard) {
-      dout(10) << "resharding needed: stats.num_objects=" << bucket_stats.num_objects
+      ldout(store->ctx(), 0) << __func__ << ": resharding needed: stats.num_objects=" << bucket_stats.num_objects
              << " shard max_objects=" <<  max_objs_per_shard * num_shards << dendl;
       need_resharding = true;
     } else {
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 23914530c0cc..7594840540ae 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -13135,7 +13135,7 @@ int RGWRados::add_bucket_to_reshard(const RGWBucketInfo& bucket_info)
   entry.bucket_name = bucket_info.bucket.name;
   entry.bucket_id = bucket_info.bucket.bucket_id;
   entry.old_num_shards = num_source_shards;
-  entry.new_num_shards = num_source_shards >> 1;
+  entry.new_num_shards = num_source_shards << 1;
 
   return reshard.add(entry);
 }