From: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
Date: Mon, 4 Nov 2019 01:57:34 +0000 (+0800)
Subject: rgw: return error if lock log shard fails
X-Git-Tag: v14.2.8~78^2~9^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32825%2Fhead;p=ceph.git

rgw: return error if lock log shard fails

Fixes: https://github.com/ceph/ceph/pull/31344

Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit 0775c1b8754f488434ec72d262d1387627e6bf62)
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 7237e5073ce..958cceb1934 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -978,12 +978,12 @@ int RGWReshard::process_single_logshard(int logshard_num)
   RGWBucketReshardLock logshard_lock(store, logshard_oid, false);
 
   int ret = logshard_lock.lock();
-  if (ret == -EBUSY) { /* already locked by another processor */
+  if (ret < 0) { 
     ldout(store->ctx(), 5) << __func__ << "(): failed to acquire lock on " <<
-      logshard_oid << dendl;
+      logshard_oid << ", ret = " << ret <<dendl;
     return ret;
   }
-
+  
   do {
     std::list<cls_rgw_reshard_entry> entries;
     ret = list(logshard_num, marker, max_entries, entries, &truncated);