]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23534 from cbodley/wip-26897
authorCasey Bodley <cbodley@users.noreply.github.com>
Wed, 26 Sep 2018 13:28:30 +0000 (09:28 -0400)
committerGitHub <noreply@github.com>
Wed, 26 Sep 2018 13:28:30 +0000 (09:28 -0400)
rgw multisite: enforce spawn_window for data full sync

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/rgw/rgw_data_sync.cc

index 0a3aa5bd99a54a7c9e8e3f5bb9694a94fbbf352a,8aa594b682aa9154e83c51ef80cf91a3248262ab..8fda3ffda83ad26a7e2f6150461ba5eb30d672b7
@@@ -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);