From 18ddb45b2ddab74aa09c707bd626d97ae54f8a82 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 8 Sep 2016 17:24:22 -0700 Subject: [PATCH] osd: Rename _scrub() to scrub_snapshot_metadata() Signed-off-by: David Zafman --- src/osd/PG.cc | 2 +- src/osd/PG.h | 2 +- src/osd/ReplicatedPG.cc | 6 +++--- src/osd/ReplicatedPG.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 9608e2b80d4b9..c3b34b74960aa 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4375,7 +4375,7 @@ void PG::scrub_compare_maps() } // ok, do the pg-type specific scrubbing - _scrub(for_meta_scrub, missing_digest); + scrub_snapshot_metadata(for_meta_scrub, missing_digest); if (!scrubber.store->empty()) { if (state_test(PG_STATE_REPAIR)) { dout(10) << __func__ << ": discarding scrub results" << dendl; diff --git a/src/osd/PG.h b/src/osd/PG.h index 1651f3b970bc2..94f2bf4f6b586 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1309,7 +1309,7 @@ public: */ virtual bool _range_available_for_scrub( const hobject_t &begin, const hobject_t &end) = 0; - virtual void _scrub( + virtual void scrub_snapshot_metadata( ScrubMap &map, const std::map, hobject_t::BitwiseComparator> &missing_digest) { } virtual void _scrub_clear_state() { } diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c47c72d945d93..439ea5d1d6f43 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -12773,11 +12773,11 @@ unsigned ReplicatedPG::process_clones_to(const boost::optional &head, * [Snapset clones 4] * EOL obj4 snap 4, (expected) */ -void ReplicatedPG::_scrub( +void ReplicatedPG::scrub_snapshot_metadata( ScrubMap &scrubmap, const map, hobject_t::BitwiseComparator> &missing_digest) { - dout(10) << "_scrub" << dendl; + dout(10) << __func__ << dendl; coll_t c(info.pgid); bool repair = state_test(PG_STATE_REPAIR); @@ -13096,7 +13096,7 @@ void ReplicatedPG::_scrub( ++scrubber.num_digest_updates_pending; } - dout(10) << "_scrub (" << mode << ") finish" << dendl; + dout(10) << __func__ << " (" << mode << ") finish" << dendl; } void ReplicatedPG::_scrub_clear_state() diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 96b07f52747f2..51f8c4af1e1db 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -1306,7 +1306,7 @@ protected: // -- scrub -- virtual bool _range_available_for_scrub( const hobject_t &begin, const hobject_t &end) override; - virtual void _scrub( + virtual void scrub_snapshot_metadata( ScrubMap &map, const std::map, hobject_t::BitwiseComparator> &missing_digest) override; -- 2.39.5