From: Sage Weil <sage@redhat.com>
Date: Wed, 5 Jul 2017 19:43:33 +0000 (-0400)
Subject: mon: use single collect_metadata helper, consistently set 'addr'
X-Git-Tag: v12.1.1~133^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c9fa52eab53b0a7721cc27721c8fac7bcc513b7b;p=ceph-ci.git

mon: use single collect_metadata helper, consistently set 'addr'

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 1e86040591a..ded7ed253ee 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1945,8 +1945,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());
+  collect_metadata(&my_meta);
   update_mon_metadata(rank, std::move(my_meta));
 }
 
@@ -1976,12 +1975,18 @@ void Monitor::lose_election(epoch_t epoch, set<int> &q, int l,
 
   if (quorum_con_features & CEPH_FEATURE_MON_METADATA) {
     Metadata sys_info;
-    collect_sys_info(&sys_info, g_ceph_context);
+    collect_metadata(&sys_info);
     messenger->send_message(new MMonMetadata(sys_info),
 			    monmap->get_inst(get_leader()));
   }
 }
 
+void Monitor::collect_metadata(Metadata *m)
+{
+  collect_sys_info(m, g_ceph_context);
+  (*m)["addr"] = stringify(messenger->get_myaddr());
+}
+
 void Monitor::finish_election()
 {
   apply_quorum_to_compatset_features();
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 534eb4a6354..30f7ae852eb 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -876,6 +876,7 @@ public:
   int write_default_keyring(bufferlist& bl);
   void extract_save_mon_key(KeyRing& keyring);
 
+  void collect_metadata(Metadata *m);
   void update_mon_metadata(int from, Metadata&& m);
   int load_metadata(map<int, Metadata>& m);
   void count_metadata(const string& field, Formatter *f);