From: Samuel Just <sjust@redhat.com>
Date: Fri, 30 Sep 2022 05:32:24 +0000 (-0700)
Subject: crimson/.../peering_event: remove ifdef'd out tracking_events bits
X-Git-Tag: v18.1.0~1068^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=667a01449e5e7175d011d0a1c554b46bc90be792;p=ceph.git

crimson/.../peering_event: remove ifdef'd out tracking_events bits

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/peering_event.h b/src/crimson/osd/osd_operations/peering_event.h
index c243c04d9038..dbd7f28ec311 100644
--- a/src/crimson/osd/osd_operations/peering_event.h
+++ b/src/crimson/osd/osd_operations/peering_event.h
@@ -133,11 +133,6 @@ public:
     conn(conn)
   {}
 
-#if 0
-  std::tuple<
-  > tracking_events;
-#endif
-
   std::tuple<
     StartEvent,
     ConnectionPipeline::AwaitActive::BlockingEvent,
@@ -150,14 +145,6 @@ public:
     PGPeeringPipeline::Process::BlockingEvent,
     BackfillRecovery::BackfillRecoveryPipeline::Process::BlockingEvent,
     OSDPipeline::AwaitActive::BlockingEvent,
-#if 0
-    PGPipeline::WaitForActive::BlockingEvent,
-    PGActivationBlocker::BlockingEvent,
-    PGPipeline::RecoverMissing::BlockingEvent,
-    PGPipeline::GetOBC::BlockingEvent,
-    PGPipeline::WaitRepop::BlockingEvent,
-    PGPipeline::SendReply::BlockingEvent,
-#endif
     CompletionEvent
   > tracking_events;
 
@@ -194,14 +181,6 @@ public:
     PG_OSDMapGate::OSDMapBlocker::BlockingEvent,
     PGPeeringPipeline::Process::BlockingEvent,
     BackfillRecovery::BackfillRecoveryPipeline::Process::BlockingEvent,
-#if 0
-    PGPipeline::WaitForActive::BlockingEvent,
-    PGActivationBlocker::BlockingEvent,
-    PGPipeline::RecoverMissing::BlockingEvent,
-    PGPipeline::GetOBC::BlockingEvent,
-    PGPipeline::WaitRepop::BlockingEvent,
-    PGPipeline::SendReply::BlockingEvent,
-#endif
     CompletionEvent
   > tracking_events;
 };