From: weiqiaomiao <wei.qiaomiao@zte.com.cn>
Date: Sat, 22 Jul 2017 05:43:10 +0000 (+0800)
Subject: rgw: should unlock when reshard_log->update() reture non-zero in RGWBucketReshard... 
X-Git-Tag: v12.1.2~156^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16502%2Fhead;p=ceph.git

rgw: should unlock when reshard_log->update() reture non-zero in RGWBucketReshard::execute()

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 1612385a0c04..0389ca33dce2 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -534,6 +534,7 @@ int RGWBucketReshard::execute(int num_shards, int max_op_entries,
   if (reshard_log) {
     ret = reshard_log->update(bucket_info, new_bucket_info);
     if (ret < 0) {
+      unlock_bucket();
       return ret;
     }
   }