From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Thu, 5 Dec 2024 08:52:42 +0000 (+0800)
Subject: crimson/net/io_handler: minor adjustments to logs
X-Git-Tag: v20.0.0~542^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0811c1b9da05b3dac9624f83bef01edae48cda23;p=ceph.git

crimson/net/io_handler: minor adjustments to logs

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/net/io_handler.cc b/src/crimson/net/io_handler.cc
index b93124f3c126..bc5e9bf404c5 100644
--- a/src/crimson/net/io_handler.cc
+++ b/src/crimson/net/io_handler.cc
@@ -347,7 +347,7 @@ void IOHandler::do_set_io_state(
 {
   ceph_assert_always(seastar::this_shard_id() == get_shard_id());
   auto prv_state = get_io_state();
-  logger().debug("{} got {}do_set_io_state(): prv_state={}, new_state={}, "
+  logger().debug("{} got {} do_set_io_state(): prv_state={}, new_state={}, "
                  "fa={}, set_notify_out={}, at {}",
                  conn,
                  cc_seq.has_value() ? fmt::format("{} ", *cc_seq) : "",
@@ -984,7 +984,7 @@ void IOHandler::notify_out_dispatch()
       });
     });
   }
-  if (shard_states->try_enter_out_dispatching()) {
+  if (shard_states->try_enter_out_dispatching(conn)) {
     shard_states->dispatch_in_background(
         "do_out_dispatch", conn, [this] {
       return do_out_dispatch(*shard_states);
diff --git a/src/crimson/net/io_handler.h b/src/crimson/net/io_handler.h
index 5986fcb16ac2..41c76ab925b8 100644
--- a/src/crimson/net/io_handler.h
+++ b/src/crimson/net/io_handler.h
@@ -309,7 +309,7 @@ public:
       in_exit_dispatching = std::nullopt;
     }
 
-    bool try_enter_out_dispatching() {
+    bool try_enter_out_dispatching(SocketConnection &conn) {
       assert(seastar::this_shard_id() == sid);
       if (out_dispatching) {
         // already dispatching out
@@ -327,6 +327,9 @@ public:
         // do not dispatch out
         return false;
       default:
+        crimson::get_logger(ceph_subsys_ms).error(
+          "{} try_enter_out_dispatching() got wrong io_state {}",
+          conn, io_state);
         ceph_abort("impossible");
       }
     }
@@ -574,6 +577,8 @@ struct fmt::formatter<crimson::net::IOHandler::io_state_t>
     case switched:
       name = "switched";
       break;
+    default:
+      name = "undefined";
     }
     return formatter<string_view>::format(name, ctx);
   }