mgr/DaemonServer: use ref_t<M>

to avoid explicit use of RefCountedObj interface. and let
intrusive_ptr<> to take care of the life cycle of messages.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/messages/MMgrOpen.h b/src/messages/MMgrOpen.h
index a55ebaa7661f31a3e2768d184f02636962184327..c5061a281caecd11dffae8bcccd57b80ee46d00c 100644 (file)
--- a/src/messages/MMgrOpen.h
+++ b/src/messages/MMgrOpen.h
@@ -88,6 +88,8 @@ private:
   MMgrOpen()
     : Message{MSG_MGR_OPEN, HEAD_VERSION, COMPAT_VERSION}
   {}
+  using RefCountedObject::put;
+  using RefCountedObject::get;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };

diff --git a/src/messages/MMgrReport.h b/src/messages/MMgrReport.h
index 3de4720a9a9afa764e222649bdb3403d12fde4ac..150c1c1c1892c946ff04bb5f6861b50664ac2feb 100644 (file)
--- a/src/messages/MMgrReport.h
+++ b/src/messages/MMgrReport.h
@@ -164,10 +164,12 @@ public:
     out << ")";
   }
 
+private:
   MMgrReport()
     : Message{MSG_MGR_REPORT, HEAD_VERSION, COMPAT_VERSION}
   {}
-private:
+  using RefCountedObject::put;
+  using RefCountedObject::get;
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };

diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc
index 7e073a58bcc077b81f0781bc6c72fcfbe4e0e691..a74fa4feb14155fb926e171cc38e6aacc7657a9e 100644 (file)
--- a/src/mgr/ClusterState.cc
+++ b/src/mgr/ClusterState.cc
@@ -64,7 +64,7 @@ void ClusterState::load_digest(MMgrDigest *m)
   mon_status_json = std::move(m->mon_status_json);
 }
 
-void ClusterState::ingest_pgstats(MPGStats *stats)
+void ClusterState::ingest_pgstats(ref_t<MPGStats> stats)
 {
   std::lock_guard l(lock);
 

diff --git a/src/mgr/ClusterState.h b/src/mgr/ClusterState.h
index c5d46fa1abfd53e21ab8bf6b9bf84ad417416146..4d43cddbe896f4909b0c49747f9ec9199c3cc411 100644 (file)
--- a/src/mgr/ClusterState.h
+++ b/src/mgr/ClusterState.h
@@ -53,7 +53,7 @@ protected:
 public:
 
   void load_digest(MMgrDigest *m);
-  void ingest_pgstats(MPGStats *stats);
+  void ingest_pgstats(ceph::ref_t<MPGStats> stats);
 
   void update_delta_stats();
 

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index de867c620d771b707676d58ad2c99416d9b3c920..c8db6652e616ba7de37933fa3319dc51dfe654e2 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -252,25 +252,24 @@ bool DaemonServer::ms_handle_refused(Connection *con)
   return false;
 }
 
-bool DaemonServer::ms_dispatch(Message *m)
+bool DaemonServer::ms_dispatch2(const ref_t<Message>& m)
 {
   // Note that we do *not* take ::lock here, in order to avoid
   // serializing all message handling.  It's up to each handler
   // to take whatever locks it needs.
   switch (m->get_type()) {
     case MSG_PGSTATS:
-      cluster_state.ingest_pgstats(static_cast<MPGStats*>(m));
+      cluster_state.ingest_pgstats(ref_cast<MPGStats>(m));
       maybe_ready(m->get_source().num());
-      m->put();
       return true;
     case MSG_MGR_REPORT:
-      return handle_report(static_cast<MMgrReport*>(m));
+      return handle_report(ref_cast<MMgrReport>(m));
     case MSG_MGR_OPEN:
-      return handle_open(static_cast<MMgrOpen*>(m));
+      return handle_open(ref_cast<MMgrOpen>(m));
     case MSG_MGR_CLOSE:
-      return handle_close(static_cast<MMgrClose*>(m));
+      return handle_close(ref_cast<MMgrClose>(m));
     case MSG_COMMAND:
-      return handle_command(static_cast<MCommand*>(m));
+      return handle_command(ref_cast<MCommand>(m));
     default:
       dout(1) << "Unhandled message type " << m->get_type() << dendl;
       return false;
@@ -406,7 +405,7 @@ static bool key_from_string(
   return true;
 }
 
-bool DaemonServer::handle_open(MMgrOpen *m)
+bool DaemonServer::handle_open(const ref_t<MMgrOpen>& m)
 {
   std::lock_guard l(lock);
 
@@ -477,11 +476,10 @@ bool DaemonServer::handle_open(MMgrOpen *m)
     daemon_connections.insert(m->get_connection());
   }
 
-  m->put();
   return true;
 }
 
-bool DaemonServer::handle_close(MMgrClose *m)
+bool DaemonServer::handle_close(const ref_t<MMgrClose>& m)
 {
   std::lock_guard l(lock);
 
@@ -503,11 +501,11 @@ bool DaemonServer::handle_close(MMgrClose *m)
   }
 
   // send same message back as a reply
-  m->get_connection()->send_message(m);
+  m->get_connection()->send_message2(m);
   return true;
 }
 
-bool DaemonServer::handle_report(MMgrReport *m)
+bool DaemonServer::handle_report(const ref_t<MMgrReport>& m)
 {
   DaemonKey key;
   if (!m->service_name.empty()) {
@@ -526,7 +524,6 @@ bool DaemonServer::handle_report(MMgrReport *m)
     dout(4) << "rejecting report from non-daemon client " << m->daemon_name
            << dendl;
     m->get_connection()->mark_down();
-    m->put();
     return true;
   }
 
@@ -635,7 +632,6 @@ bool DaemonServer::handle_report(MMgrReport *m)
     osd_perf_metric_collector.process_reports(m->osd_perf_metric_reports);
   }
 
-  m->put();
   return true;
 }
 
@@ -715,16 +711,12 @@ bool DaemonServer::_allowed_command(
  */
 class CommandContext {
 public:
-  MCommand *m;
+  ceph::ref_t<MCommand> m;
   bufferlist odata;
   cmdmap_t cmdmap;
 
-  explicit CommandContext(MCommand *m_)
-    : m(m_) {
-  }
-
-  ~CommandContext() {
-    m->put();
+  explicit CommandContext(ceph::ref_t<MCommand> m)
+    : m{std::move(m)} {
   }
 
   void reply(int r, const std::stringstream &ss) {
@@ -772,10 +764,10 @@ public:
   }
 };
 
-bool DaemonServer::handle_command(MCommand *m)
+bool DaemonServer::handle_command(const ref_t<MCommand>& m)
 {
   std::lock_guard l(lock);
-  std::shared_ptr<CommandContext> cmdctx = std::make_shared<CommandContext>(m);
+  auto cmdctx = std::make_shared<CommandContext>(m);
   try {
     return _handle_command(m, cmdctx);
   } catch (const bad_cmd_get& e) {
@@ -785,7 +777,7 @@ bool DaemonServer::handle_command(MCommand *m)
 }
 
 bool DaemonServer::_handle_command(
-  MCommand *m,
+  const ref_t<MCommand>& m,
   std::shared_ptr<CommandContext>& cmdctx)
 {
   auto priv = m->get_connection()->get_priv();

diff --git a/src/mgr/DaemonServer.h b/src/mgr/DaemonServer.h
index 310a030b1b59adcd642edaafb28a34d356404eb3..b728fabad8d68fa05e418af3114678783358bd0d 100644 (file)
--- a/src/mgr/DaemonServer.h
+++ b/src/mgr/DaemonServer.h
@@ -137,7 +137,7 @@ public:
               LogChannelRef auditcl);
   ~DaemonServer() override;
 
-  bool ms_dispatch(Message *m) override;
+  bool ms_dispatch2(const ceph::ref_t<Message>& m) override;
   int ms_handle_authentication(Connection *con) override;
   bool ms_handle_reset(Connection *con) override;
   void ms_handle_remote_reset(Connection *con) override {}
@@ -145,11 +145,12 @@ public:
   bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer) override;
   KeyStore *ms_get_auth1_authorizer_keystore() override;
 
-  bool handle_open(MMgrOpen *m);
-  bool handle_close(MMgrClose *m);
-  bool handle_report(MMgrReport *m);
-  bool handle_command(MCommand *m);
-  bool _handle_command(MCommand *m, std::shared_ptr<CommandContext>& cmdctx);
+  bool handle_open(const ceph::ref_t<MMgrOpen>& m);
+  bool handle_close(const ceph::ref_t<MMgrClose>& m);
+  bool handle_report(const ceph::ref_t<MMgrReport>& m);
+  bool handle_command(const ceph::ref_t<MCommand>& m);
+  bool _handle_command(const ceph::ref_t<MCommand>& m,
+                      std::shared_ptr<CommandContext>& cmdctx);
   void send_report();
   void got_service_map();
   void got_mgr_map();