From: Shilpa Jagannath <smanjara@redhat.com>
Date: Mon, 29 Jun 2020 19:17:53 +0000 (+0530)
Subject: rgw: use rgw::BucketReshardState for reshard state change
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0cf0313e181d2fadd569f31d82c8df08038e0fa2;p=ceph.git

rgw: use rgw::BucketReshardState for reshard state change

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index e1a13e14eee0e..9adc89d3541c6 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -402,7 +402,7 @@ public:
       }
       set_status(rgw::BucketReshardState::None, dpp);
     }
-  }
+  } 
 
   int start() {
     int ret = set_status(rgw::BucketReshardState::InProgress, dpp);
@@ -668,12 +668,6 @@ int RGWBucketReshard::do_reshard(int num_shards,
       return ret;
   }
 
-  ret = bucket_info_updater.complete();
-  if (ret < 0) {
-    ldout(store->ctx(), 0) << __func__ << ": failed to update bucket info ret=" << ret << dendl;
-    /* don't error out, reshard process succeeded */
-  }
-
   return 0;
   // NB: some error clean-up is done by ~BucketInfoReshardUpdate
 } // RGWBucketReshard::do_reshard
@@ -707,14 +701,6 @@ int RGWBucketReshard::execute(int num_shards, int max_op_entries,
     }
   }
 
-  // set resharding status of current bucket_info & shards with
-  // information about planned resharding
-  ret = set_resharding_status(dpp, cls_rgw_reshard_status::IN_PROGRESS);
-  if (ret < 0) {
-    return ret;
-    goto error_out;
-  }
-
   ret = do_reshard(num_shards,
 		   max_op_entries,
                    verbose, out, formatter, dpp);