From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 10 Jul 2020 20:24:05 +0000 (+0200)
Subject: crimson/osd: automate state logging in the backfill FSM.
X-Git-Tag: v17.0.0~1752^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=20c49c8c33ce06cbbeb1c7be66a7460df1a6fa6e;p=ceph.git

crimson/osd: automate state logging in the backfill FSM.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/backfill_state.cc b/src/crimson/osd/backfill_state.cc
index 44f9fa0177d81..7c66013e18c99 100644
--- a/src/crimson/osd/backfill_state.cc
+++ b/src/crimson/osd/backfill_state.cc
@@ -2,6 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include <algorithm>
+#include <boost/type_index.hpp>
 
 #include "crimson/osd/backfill_state.h"
 #include "crimson/osd/backfill_facades.h"
@@ -31,6 +32,20 @@ BackfillState::BackfillState(
   backfill_machine.initiate();
 }
 
+template <class S>
+BackfillState::StateHelper<S>::StateHelper()
+{
+  logger().debug("enter {}",
+		 boost::typeindex::type_id<S>().pretty_name());
+}
+
+template <class S>
+BackfillState::StateHelper<S>::~StateHelper()
+{
+  logger().debug("exit {}",
+		 boost::typeindex::type_id<S>().pretty_name());
+}
+
 BackfillState::~BackfillState() = default;
 
 BackfillState::BackfillMachine::BackfillMachine(
@@ -265,7 +280,6 @@ BackfillState::Enqueuing::update_on_peers(const hobject_t& check)
 BackfillState::Enqueuing::Enqueuing(my_context ctx)
   : my_base(ctx)
 {
-  logger().debug("{}", __func__);
   auto& primary_bi = backfill_state().backfill_info;
 
   // update our local interval to cope with recent changes
@@ -336,7 +350,6 @@ BackfillState::Enqueuing::Enqueuing(my_context ctx)
 BackfillState::PrimaryScanning::PrimaryScanning(my_context ctx)
   : my_base(ctx)
 {
-  logger().debug("{}", __func__);
   backfill_state().backfill_info.version = \
     peering_state().get_info().last_update;
   backfill_listener().request_primary_scan(
@@ -373,7 +386,6 @@ bool BackfillState::ReplicasScanning::replica_needs_scan(
 BackfillState::ReplicasScanning::ReplicasScanning(my_context ctx)
   : my_base(ctx)
 {
-  logger().debug("{}", __func__);
   for (const auto& bt : peering_state().get_backfill_targets()) {
     if (const auto& pbi = backfill_state().peer_backfill_info.at(bt);
         replica_needs_scan(pbi, backfill_state().backfill_info)) {
@@ -434,7 +446,6 @@ BackfillState::ReplicasScanning::react(ObjectPushed evt)
 BackfillState::Waiting::Waiting(my_context ctx)
   : my_base(ctx)
 {
-  logger().debug("{}: entered Waiting", __func__);
 }
 
 boost::statechart::result
diff --git a/src/crimson/osd/backfill_state.h b/src/crimson/osd/backfill_state.h
index 96ae2482af7b0..8094490db461a 100644
--- a/src/crimson/osd/backfill_state.h
+++ b/src/crimson/osd/backfill_state.h
@@ -96,6 +96,9 @@ public:
 private:
   template <class S>
   struct StateHelper {
+    StateHelper();
+    ~StateHelper();
+
     BackfillState& backfill_state() {
       return static_cast<S*>(this) \
         ->template context<BackfillMachine>().backfill_state;