From 304db57b36d871143273620fa3b4481456b4a8d8 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Sat, 23 Dec 2023 12:19:06 -0600 Subject: [PATCH] osd/scrub: remove unused PGScrubGotLocalMap message The relevant event (IntLocalMapDone) is processed directly within the scrubber, instead of being queued to the OSD events queue. Signed-off-by: Ronen Friedman --- src/osd/OSD.cc | 6 ------ src/osd/OSD.h | 3 --- src/osd/PG.h | 5 ----- src/osd/scheduler/OpSchedulerItem.cc | 9 --------- src/osd/scheduler/OpSchedulerItem.h | 8 -------- 5 files changed, 31 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 0f9c4f1acc7..39e408c3035 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1840,12 +1840,6 @@ void OSDService::queue_scrub_digest_update(PG* pg, Scrub::scrub_prio_t with_prio queue_scrub_event_msg(pg, with_priority); } -void OSDService::queue_scrub_got_local_map(PG* pg, Scrub::scrub_prio_t with_priority) -{ - // Resulting scrub event: 'IntLocalMapDone' - queue_scrub_event_msg(pg, with_priority); -} - void OSDService::queue_scrub_got_repl_maps(PG* pg, Scrub::scrub_prio_t with_priority) { // Resulting scrub event: 'GotReplicas' diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 2eff838a2f9..2c806fd356e 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -526,9 +526,6 @@ public: /// Signals that all write OPs are done void queue_scrub_digest_update(PG* pg, Scrub::scrub_prio_t with_priority); - /// Signals that the the local (Primary's) scrub map is ready - void queue_scrub_got_local_map(PG* pg, Scrub::scrub_prio_t with_priority); - /// Signals that we (the Primary) got all waited-for scrub-maps from our replicas void queue_scrub_got_repl_maps(PG* pg, Scrub::scrub_prio_t with_priority); diff --git a/src/osd/PG.h b/src/osd/PG.h index 6e81af436e7..a5f01aecc27 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -475,11 +475,6 @@ public: forward_scrub_event(&ScrubPgIF::digest_update_notification, queued, "DigestUpdate"); } - void scrub_send_local_map_ready(epoch_t queued, ThreadPool::TPHandle& handle) - { - forward_scrub_event(&ScrubPgIF::send_local_map_done, queued, "IntLocalMapDone"); - } - void scrub_send_replmaps_ready(epoch_t queued, ThreadPool::TPHandle& handle) { forward_scrub_event(&ScrubPgIF::send_replica_maps_ready, queued, "GotReplicas"); diff --git a/src/osd/scheduler/OpSchedulerItem.cc b/src/osd/scheduler/OpSchedulerItem.cc index 750fc2a4f58..ecad656bab9 100644 --- a/src/osd/scheduler/OpSchedulerItem.cc +++ b/src/osd/scheduler/OpSchedulerItem.cc @@ -113,15 +113,6 @@ void PGScrubDigestUpdate::run(OSD* osd, pg->unlock(); } -void PGScrubGotLocalMap::run(OSD* osd, - OSDShard* sdata, - PGRef& pg, - ThreadPool::TPHandle& handle) -{ - pg->scrub_send_local_map_ready(epoch_queued, handle); - pg->unlock(); -} - void PGScrubGotReplMaps::run(OSD* osd, OSDShard* sdata, PGRef& pg, diff --git a/src/osd/scheduler/OpSchedulerItem.h b/src/osd/scheduler/OpSchedulerItem.h index 7fb7125a141..0b28e64158e 100644 --- a/src/osd/scheduler/OpSchedulerItem.h +++ b/src/osd/scheduler/OpSchedulerItem.h @@ -423,14 +423,6 @@ class PGScrubDigestUpdate : public PGScrubItem { void run(OSD* osd, OSDShard* sdata, PGRef& pg, ThreadPool::TPHandle& handle) final; }; -class PGScrubGotLocalMap : public PGScrubItem { - public: - PGScrubGotLocalMap(spg_t pg, epoch_t epoch_queued) - : PGScrubItem{pg, epoch_queued, "PGScrubGotLocalMap"} - {} - void run(OSD* osd, OSDShard* sdata, PGRef& pg, ThreadPool::TPHandle& handle) final; -}; - class PGScrubGotReplMaps : public PGScrubItem { public: PGScrubGotReplMaps(spg_t pg, epoch_t epoch_queued) -- 2.47.3