mon,mds: include 'addr' in daemon metadata

This is useful for correlating daemon metadata
to cluster maps.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc
index 3cd12cdad1756512d1c465a6ea9739df57690b47..c6fd128b8a3da15daa4718f7a42cbc7e631a81e1 100644 (file)
--- a/src/mds/Beacon.cc
+++ b/src/mds/Beacon.cc
@@ -215,6 +215,7 @@ void Beacon::_send()
   if (want_state == MDSMap::STATE_BOOT) {
     map<string, string> sys_info;
     collect_sys_info(&sys_info, cct);
+    sys_info["addr"] = stringify(monc->get_myaddr());
     beacon->set_sys_info(sys_info);
   }
   monc->send_mon_message(beacon);

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index f0383880ec9e014117586b1d6d72330e2fcf52bc..4adf0260cf0e29d4b6e6632bdf3902f967514c06 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -370,6 +370,7 @@ public:
   }
 
   void set_messenger(Messenger *m) { messenger = m; }
+  entity_addr_t get_myaddr() const { return messenger->get_myaddr(); }
 
   void send_auth_message(Message *m) {
     _send_mon_message(m, true);

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c8a9acdd18ef894b9729362eab7b873471082e43..86ae2cac5b894d75e1f44890f746fea7c39ea44b 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1910,6 +1910,7 @@ void Monitor::win_election(epoch_t epoch, set<int>& active, uint64_t features,
 
   Metadata my_meta;
   collect_sys_info(&my_meta, g_ceph_context);
+  my_meta["addr"] = stringify(messenger->get_myaddr());
   update_mon_metadata(rank, std::move(my_meta));
 }