From: Dan Mick <dan.mick@redhat.com>
Date: Thu, 8 Jun 2017 02:52:13 +0000 (-0700)
Subject: mgr/DaemonServer.cc: log daemon type string as well as id
X-Git-Tag: v12.1.0~208^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0384acea9d44acca78b770a0136311c97a1dad6a;p=ceph.git

mgr/DaemonServer.cc: log daemon type string as well as id

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index faa60a77659c..a8ac275d7cec 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -263,12 +263,11 @@ void DaemonServer::shutdown()
 
 bool DaemonServer::handle_open(MMgrOpen *m)
 {
-  DaemonKey key(
-      m->get_connection()->get_peer_type(),
-      m->daemon_name);
+  uint32_t type = m->get_connection()->get_peer_type();
+  DaemonKey key(type, m->daemon_name);
 
   dout(4) << "from " << m->get_connection() << " name "
-          << m->daemon_name << dendl;
+          << ceph_entity_type_name(type) << "." << m->daemon_name << dendl;
 
   auto configure = new MMgrConfigure();
   configure->stats_period = g_conf->mgr_stats_period;
@@ -285,12 +284,11 @@ bool DaemonServer::handle_open(MMgrOpen *m)
 
 bool DaemonServer::handle_report(MMgrReport *m)
 {
-  DaemonKey key(
-      m->get_connection()->get_peer_type(),
-      m->daemon_name);
+  uint32_t type = m->get_connection()->get_peer_type();
+  DaemonKey key(type, m->daemon_name);
 
   dout(4) << "from " << m->get_connection() << " name "
-          << m->daemon_name << dendl;
+          << ceph_entity_type_name(type) << "." << m->daemon_name << dendl;
 
   DaemonStatePtr daemon;
   if (daemon_state.exists(key)) {