From b0f4307b9cce2af208c96aea0d5020f6995e20ef Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 6 Oct 2020 17:59:14 -0400 Subject: [PATCH] rgw: rename to inc_status_oid Signed-off-by: Casey Bodley --- src/rgw/rgw_data_sync.cc | 10 +++++----- src/rgw/rgw_data_sync.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index c539de7751dcc..9e06c8c12085a 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -1011,7 +1011,7 @@ public: ceph::real_time* progress) : RGWCoroutine(_sc->cct), sc(_sc), sync_env(_sc->env), lease_cr(std::move(lease_cr)), sync_pair(_sync_pair), progress(progress), - status_oid(RGWBucketPipeSyncStatusManager::status_oid(sc->source_zone, sync_pair)), + status_oid(RGWBucketPipeSyncStatusManager::inc_status_oid(sc->source_zone, sync_pair)), tn(sync_env->sync_tracer->add_node(_tn_parent, "bucket", SSTR(bucket_shard_str{_sync_pair.dest_bs} << "<-" << bucket_shard_str{_sync_pair.source_bs} ))) { } @@ -2751,7 +2751,7 @@ public: RGWObjVersionTracker& objv_tracker) : RGWCoroutine(_sc->cct), sc(_sc), sync_env(_sc->env), sync_pair(_sync_pair), - sync_status_oid(RGWBucketPipeSyncStatusManager::status_oid(sc->source_zone, _sync_pair)), + sync_status_oid(RGWBucketPipeSyncStatusManager::inc_status_oid(sc->source_zone, _sync_pair)), status(_status), objv_tracker(objv_tracker) {} @@ -2925,7 +2925,7 @@ public: rgw_bucket_shard_sync_info *_status, RGWObjVersionTracker* objv_tracker) : RGWCoroutine(_sc->cct), sc(_sc), sync_env(_sc->env), - oid(RGWBucketPipeSyncStatusManager::status_oid(sc->source_zone, sync_pair)), + oid(RGWBucketPipeSyncStatusManager::inc_status_oid(sc->source_zone, sync_pair)), status(_status), objv_tracker(objv_tracker) {} int operate(const DoutPrefixProvider *dpp) override; @@ -4883,8 +4883,8 @@ std::ostream& RGWBucketPipeSyncStatusManager::gen_prefix(std::ostream& out) cons << " bucket:" << dest_bucket << ' '; } -string RGWBucketPipeSyncStatusManager::status_oid(const rgw_zone_id& source_zone, - const rgw_bucket_sync_pair_info& sync_pair) +string RGWBucketPipeSyncStatusManager::inc_status_oid(const rgw_zone_id& source_zone, + const rgw_bucket_sync_pair_info& sync_pair) { if (sync_pair.source_bs == sync_pair.dest_bs) { return bucket_status_oid_prefix + "." + source_zone.id + ":" + sync_pair.dest_bs.get_key(); diff --git a/src/rgw/rgw_data_sync.h b/src/rgw/rgw_data_sync.h index 1b6cfb3ace7ae..b4e371fa83579 100644 --- a/src/rgw/rgw_data_sync.h +++ b/src/rgw/rgw_data_sync.h @@ -725,7 +725,9 @@ public: std::map& get_sync_status() { return sync_status; } int init_sync_status(const DoutPrefixProvider *dpp); - static std::string status_oid(const rgw_zone_id& source_zone, const rgw_bucket_sync_pair_info& bs); + static std::string inc_status_oid(const rgw_zone_id& source_zone, + const rgw_bucket_sync_pair_info& bs); + // specific source obj sync status, can be used by sync modules static std::string obj_status_oid(const rgw_bucket_sync_pipe& sync_pipe, const rgw_zone_id& source_zone, const rgw::sal::Object* obj); /* specific source obj sync status, can be used by sync modules */ -- 2.39.5