From e67cc025e05619b60af0ad5deff45e9075f86207 Mon Sep 17 00:00:00 2001
From: chunmei <chunmei.liu@intel.com>
Date: Fri, 23 Jun 2023 04:35:38 +0000
Subject: [PATCH] crimson/osd: modify the interface to integrate with
 milticore-msg

Signed-off-by: chunmei <chunmei.liu@intel.com>
(cherry picked from commit 00a5eaea4661e6fb23d174b2f367222541b24f21)
---
 src/crimson/osd/osd.cc | 26 +++++++++++++++++---------
 src/crimson/osd/osd.h  |  2 --
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index fd57b811bb6ac..342a8225dd9bc 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -742,7 +742,9 @@ void OSD::ShardDispatcher::print(std::ostream& out) const
 std::optional<seastar::future<>>
 OSD::ms_dispatch(crimson::net::ConnectionRef conn, MessageRef m)
 {
-  assert(seastar::this_shard_id() == PRIMARY_CORE);
+  if (get_pg_shard_manager().is_stopping()) {
+    return seastar::now();
+  }
   bool dispatched = true;
   gate.dispatch_in_background(__func__, *this, [this, conn=std::move(conn),
                                                 m=std::move(m), &dispatched]() mutable {
@@ -775,11 +777,7 @@ OSD::ms_dispatch(crimson::net::ConnectionRef conn, MessageRef m)
       case MSG_OSD_PG_UPDATE_LOG_MISSING_REPLY:
       {
         return conn.get_foreign().then([this, m = std::move(m)](auto f_conn) {
-          return shard_dispatchers.invoke_on(PRIMARY_CORE,
-            [f_conn = std::move(f_conn), m = std::move(m)]
-            (auto &local_dispatcher) mutable ->seastar::future<>{
-            return local_dispatcher.ms_dispatch(std::move(f_conn), std::move(m));
-          });
+          return shard_dispatchers.local().ms_dispatch(std::move(f_conn), std::move(m));
         });
       }
       default:
@@ -797,10 +795,20 @@ OSD::ShardDispatcher::ms_dispatch(
   crimson::net::ConnectionFRef f_conn,
    MessageRef m)
 {
-  crimson::net::ConnectionRef conn = make_local_shared_foreign(std::move(f_conn));
-  if (pg_shard_manager.is_stopping()) {
-    return seastar::now();
+  if (seastar::this_shard_id() != PRIMARY_CORE) {
+    switch (m->get_type()) {
+    case CEPH_MSG_OSD_MAP:
+    case MSG_COMMAND:
+    case MSG_OSD_MARK_ME_DOWN:
+      return container().invoke_on(PRIMARY_CORE,
+      [f_conn = std::move(f_conn), m = std::move(m)]
+      (auto& local_dispatcher) mutable {
+        return local_dispatcher.ms_dispatch(std::move(f_conn), std::move(m));
+      });
+    }
   }
+  crimson::net::ConnectionRef conn = make_local_shared_foreign(std::move(f_conn));
+
   switch (m->get_type()) {
   case CEPH_MSG_OSD_MAP:
     return handle_osd_map(boost::static_pointer_cast<MOSDMap>(m));
diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h
index 9dc1b454342ec..d9b6f1dc71f20 100644
--- a/src/crimson/osd/osd.h
+++ b/src/crimson/osd/osd.h
@@ -236,12 +236,10 @@ public:
   }
 
   auto &get_pg_shard_manager() {
-    ceph_assert(seastar::this_shard_id() == PRIMARY_CORE);
     return shard_dispatchers.local().get_pg_shard_manager();
   }
 
   auto &get_pg_shard_manager() const {
-    ceph_assert(seastar::this_shard_id() == PRIMARY_CORE);
     return shard_dispatchers.local().get_pg_shard_manager();
   }
 
-- 
2.39.5