From dd6bf0b5a8e7087724d0d4debc88334978dffde7 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 12 Mar 2020 16:43:05 -0400 Subject: [PATCH] rgw: clean up index after full data sync Fixes: https://tracker.ceph.com/issues/40177 Signed-off-by: Casey Bodley --- src/rgw/rgw_data_sync.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index 19f8c2568b0..1e988d4ce33 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -1626,6 +1626,12 @@ public: drain_all(); return set_cr_error(retcode); } + // clean up full sync index + yield { + const auto& pool = sync_env->svc->zone->get_zone_params().log_pool; + auto oid = full_data_sync_index_shard_oid(sc->source_zone.id, shard_id); + call(new RGWRadosRemoveCR(sync_env->store, {pool, oid})); + } // keep lease and transition to incremental_sync() } return 0;