From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Mon, 14 Jun 2021 14:03:35 +0000 (+0300)
Subject: rgw/multisite: support enable right after disable
X-Git-Tag: v18.0.0~787^2~87
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7c94b011252ebb8203d45ebc4ee4bf655a11b35;p=ceph.git

rgw/multisite: support enable right after disable

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 6a9fd74069db..9ac5ac768123 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -2779,13 +2779,14 @@ public:
         status.encode_all_attrs(attrs);
         call(new RGWSimpleRadosWriteAttrsCR(dpp, sync_env->async_rados, sync_env->svc->sysobj,
                                             obj, attrs, &objv_tracker, exclusive));
-        ldout(cct, 20) << "init marker position: " << status.inc_marker.position << 
-          ". written to shard status object: " << sync_status_oid << dendl;
       }
 
       if (retcode < 0) {
+        ldout(cct, 20) << "ERROR: init marker position failed. error: " << retcode << dendl;
         return set_cr_error(retcode);
       }
+      ldout(cct, 20) << "init marker position: " << status.inc_marker.position << 
+        ". written to shard status object: " << sync_status_oid << dendl;
       return set_cr_done();
     }
     return 0;
@@ -5298,7 +5299,11 @@ int RGWSyncBucketCR::operate(const DoutPrefixProvider *dpp)
           RELEASE_LOCK(bucket_lease_cr);
           return set_cr_done();
 			  }
-        bucket_stopped = false;
+        if (bucket_stopped) {
+          tn->log(20, SSTR("ERROR: switched from 'stop' to 'start' sync. while state is: " << bucket_status.state));
+          bucket_stopped = false;
+          bucket_status.state = BucketSyncState::Init;
+        }
       }
 
       if (bucket_status.state != BucketSyncState::Incremental) {
@@ -5328,6 +5333,7 @@ int RGWSyncBucketCR::operate(const DoutPrefixProvider *dpp)
           tn->log(20, SSTR("ERROR: reading the status after acquiring the lock failed. error: " << retcode));
           return set_cr_error(retcode);
         }
+        tn->log(20, SSTR("status after acquiring the lock is: " << bucket_status.state));
 
         // init sync status
         yield {