From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 29 Jun 2015 22:34:44 +0000 (-0700)
Subject: rgw: orphans, fix check on number of shards
X-Git-Tag: v9.0.3~76^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47edec359be2a4d230a4a54c0c670d0aa711fa1e;p=ceph.git

rgw: orphans, fix check on number of shards

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index 0500746f9cdd..257dd8074f39 100644
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -165,9 +165,9 @@ int RGWOrphanSearch::init(const string& job_name, RGWOrphanSearchInfo *info) {
     return r;
   }
 
+  uint64_t num_shards = (info->num_shards ? info->num_shards : DEFAULT_NUM_SHARDS);
   if (r == 0) {
-    if (info->num_shards != state.info.num_shards) {
-      lderr(store->ctx()) << "ERROR: cannot specify different number of shards for existing job" << dendl;
+    if (num_shards != state.info.num_shards) {
       return -EINVAL;
     }
     search_info = state.info;
@@ -175,7 +175,7 @@ int RGWOrphanSearch::init(const string& job_name, RGWOrphanSearchInfo *info) {
   } else { /* r == -ENOENT */
     search_info = *info;
     search_info.job_name = job_name;
-    search_info.num_shards = (info->num_shards ? info->num_shards : DEFAULT_NUM_SHARDS);
+    search_info.num_shards = num_shards;
     search_info.start_time = ceph_clock_now(store->ctx());
     search_stage = RGWOrphanSearchStage(ORPHAN_SEARCH_STAGE_INIT);