From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 20 Feb 2019 19:01:24 +0000 (-0500)
Subject: luminous: rgw: correct backport to abort on bucket sync disable
X-Git-Tag: v12.2.12~6^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ec931a22e263c022531410c619ccece7447cfb0;p=ceph.git

luminous: rgw: correct backport to abort on bucket sync disable

the backport http://tracker.ceph.com/issues/26979 missed a block of code
to handle ENOENT on bucket sync disable

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index f487c6b70a1..04cb18163c1 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -3085,6 +3085,12 @@ int RGWRunBucketSyncCoroutine::operate()
     do {
       if (sync_status.state == rgw_bucket_shard_sync_info::StateInit) {
         yield call(new RGWInitBucketShardSyncStatusCoroutine(sync_env, bs, sync_status));
+        if (retcode == -ENOENT) {
+          ldout(sync_env->cct, 0) << "bucket sync disabled" << dendl;
+          lease_cr->abort(); // deleted lease object, abort instead of unlock
+          drain_all();
+          return set_cr_done();
+        }
         if (retcode < 0) {
           ldout(sync_env->cct, 0) << "ERROR: init sync on " << bucket_shard_str{bs}
               << " failed, retcode=" << retcode << dendl;