From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 16 Jan 2019 03:35:14 +0000 (-0800)
Subject: rgw: lifecycle: modify locked check
X-Git-Tag: v14.1.0~314^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d9db1061a99797829a6e1f9ee31486a32c4e35b;p=ceph.git

rgw: lifecycle: modify locked check

Can get either -EBUSY or -EEXIST.

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

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index 5e4f325b52f0..8abb73a27a91 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -1042,7 +1042,7 @@ int RGWLC::bucket_lc_post(int index, int max_lock_sec, pair<string, int >& entry
 
   do {
     int ret = l.lock_exclusive(&store->lc_pool_ctx, obj_names[index]);
-    if (ret == -EBUSY) { /* already locked by another lc processor */
+    if (ret == -EBUSY || ret == -EEXIST) { /* already locked by another lc processor */
       ldpp_dout(this, 0) << "RGWLC::bucket_lc_post() failed to acquire lock on "
           << obj_names[index] << ", sleep 5, try again" << dendl;
       sleep(5);
@@ -1129,7 +1129,7 @@ int RGWLC::process(int index, int max_lock_secs)
     l.set_duration(time);
 
     int ret = l.lock_exclusive(&store->lc_pool_ctx, obj_names[index]);
-    if (ret == -EBUSY) { /* already locked by another lc processor */
+    if (ret == -EBUSY || ret == -EEXIST) { /* already locked by another lc processor */
       ldpp_dout(this, 0) << "RGWLC::process() failed to acquire lock on "
           << obj_names[index] << ", sleep 5, try again" << dendl;
       sleep(5);
@@ -1322,7 +1322,7 @@ static int guard_lc_modify(RGWRados* store, const rgw_bucket& bucket, const stri
 
   do {
     ret = l.lock_exclusive(ctx, oid);
-    if (ret == -EBUSY) {
+    if (ret == -EBUSY || ret == -EEXIST) {
       ldout(cct, 0) << "RGWLC::RGWPutLC() failed to acquire lock on "
           << oid << ", sleep 5, try again" << dendl;
       sleep(5); // XXX: return retryable error