From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Wed, 26 Sep 2018 13:28:30 +0000 (-0400)
Subject: Merge pull request #23534 from cbodley/wip-26897
X-Git-Tag: v14.0.1~176
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8ff2ecaa830e26a8f6e5380ac37e3212e802ffda;p=ceph.git

Merge pull request #23534 from cbodley/wip-26897

rgw multisite: enforce spawn_window for data full sync

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

8ff2ecaa830e26a8f6e5380ac37e3212e802ffda
diff --cc src/rgw/rgw_data_sync.cc
index 0a3aa5bd99a54,8aa594b682aa9..8fda3ffda83ad
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@@ -1299,8 -1408,14 +1316,13 @@@ public
                                       1 /* no buffer */);
        error_repo->get();
        spawn(error_repo, false);
 -      logger.log("inc sync");
        set_marker_tracker(new RGWDataSyncShardMarkerTrack(sync_env, status_oid, sync_marker, tn));
        do {
+         if (!lease_cr->is_locked()) {
+           stop_spawned_services();
+           drain_all();
+           return set_cr_error(-ECANCELED);
+         }
          current_modified.clear();
          inc_lock.Lock();
          current_modified.swap(modified_shards);