mon: share extra probe peers with debug log, mon_status

This is useful when debugging initial quorum formation.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 405ab30597bf1ca0fb11ed5eb0cccd8951b5a86a..11cad14979edf600b9a1abc5804925ca76755706 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -401,6 +401,7 @@ int Monitor::preinit()
                                  &extra_probe_peers);
 
       dout(10) << " monmap is " << *monmap << dendl;
+      dout(10) << " extra probe peers " << extra_probe_peers << dendl;
     }
   }
 
@@ -2256,6 +2257,13 @@ void Monitor::_mon_status(ostream& ss)
     jf.dump_string("mon", *p);
   jf.close_section();
 
+  jf.open_array_section("extra_probe_peers");
+  for (set<entity_addr_t>::iterator p = extra_probe_peers.begin();
+       p != extra_probe_peers.end();
+       ++p)
+    jf.dump_stream("peer") << *p;
+  jf.close_section();
+
   if (is_synchronizing()) {
     jf.dump_stream("sync_leader") << sync_leader->entity;
     jf.dump_stream("sync_provider") << sync_provider->entity;