From: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
Date: Thu, 24 Oct 2019 00:47:09 +0000 (+0800)
Subject: rgw: clean index and remove bucket instance info when setting resharding
X-Git-Tag: v15.1.0~79^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d5f05780860133c9e293ea9328d39ee0cb42bed;p=ceph.git

rgw: clean index and remove bucket instance info when setting resharding
status fails.

Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 4c05001199d..42df6adf7bc 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -681,8 +681,7 @@ int RGWBucketReshard::execute(int num_shards, int max_op_entries,
   ret = set_resharding_status(new_bucket_info.bucket.bucket_id,
 			      num_shards, CLS_RGW_RESHARD_IN_PROGRESS);
   if (ret < 0) {
-    reshard_lock.unlock();
-    return ret;
+    goto error_out;
   }
 
   ret = do_reshard(num_shards,