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 <rfriedma@redhat.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0f9c4f1acc798d192d330095cb0c8c6961c2f9b9..39e408c30354b038d1edfdac8be39d31fc87dc2a 100644 (file)
--- 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<PGScrubDigestUpdate>(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<PGScrubGotLocalMap>(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 2eff838a2f93644ca92cefa1110e4293390a3f74..2c806fd356e63433c4d4c81b30d00b9d3aa76334 100644 (file)
--- 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 6e81af436e7d1167d2ab3f633c020c9cb5fa4c7b..a5f01aecc27da1d9f5fa9f3c830fcbcab7b9b73c 100644 (file)
--- 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 750fc2a4f58ef650d93f6967f82b526e6e223895..ecad656bab9a4b1a30a51337f127c0c92d81de35 100644 (file)
--- 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 7fb7125a14169b1bf64f71f7a98d7dda7824b8d4..0b28e64158e4ef0e2bbf31637bebf8ad00a21684 100644 (file)
--- 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)