From 913b32b6cd4327feae5733cfecd004ba515e747e Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 19 Feb 2019 08:37:18 -0500 Subject: [PATCH] rgw: wakeup lease_cr after abort on bucket sync disable the 'bucket sync disable' tests were causing data sync to lag behind because these calls to lease_cr->abort() were still waiting for the RGWContinuousLeaseCR to wake up from its sleep. added data sync checkpoints to each 'bucket sync disable' test to make sure that data sync catches up before running other tests, as this was causing failures in the new 'datalog autotrim' test Signed-off-by: Casey Bodley (cherry picked from commit 14c430337bf1a7929f4e56f8e1a5ec3948d1c2cd) Conflicts: src/rgw/rgw_data_sync.cc: log tracing --- src/rgw/rgw_data_sync.cc | 4 +++- src/test/rgw/rgw_multi/tests.py | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index 04cb18163c14..2463b38de105 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -3087,7 +3087,9 @@ int RGWRunBucketSyncCoroutine::operate() 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 + lease_cr->abort(); // deleted lease object, abort/wakeup instead of unlock + lease_cr->wakeup(); + lease_cr.reset(); drain_all(); return set_cr_done(); } diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index e5afe4e12971..1aba57227ea9 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -994,6 +994,8 @@ def test_bucket_sync_disable(): for zone in zonegroup.zones: check_buckets_sync_status_obj_not_exist(zone, buckets) + zonegroup_data_checkpoint(zonegroup_conns) + def test_bucket_sync_enable_right_after_disable(): zonegroup = realm.master_zonegroup() zonegroup_conns = ZonegroupConns(zonegroup) @@ -1024,6 +1026,8 @@ def test_bucket_sync_enable_right_after_disable(): for bucket_name in buckets: zonegroup_bucket_checkpoint(zonegroup_conns, bucket_name) + zonegroup_data_checkpoint(zonegroup_conns) + def test_bucket_sync_disable_enable(): zonegroup = realm.master_zonegroup() zonegroup_conns = ZonegroupConns(zonegroup) @@ -1060,6 +1064,8 @@ def test_bucket_sync_disable_enable(): for bucket_name in buckets: zonegroup_bucket_checkpoint(zonegroup_conns, bucket_name) + zonegroup_data_checkpoint(zonegroup_conns) + def test_multipart_object_sync(): zonegroup = realm.master_zonegroup() zonegroup_conns = ZonegroupConns(zonegroup) -- 2.47.3