mon: only rename peers in seed monmap

Once we have a committed monmap, stop renaming peers.  This only gets us
confused because our monmap does not match the paxos committed one.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 25c4a499b2fc7fb3efdcb5eae1697f76912770f9..f2188c8c2f38222b552f179afb6a79364ddc70ca 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -659,11 +659,13 @@ void Monitor::handle_probe_reply(MMonProbe *m)
 
   // rename peer?
   string peer_name = monmap->get_name(m->get_source_addr());
-  if (peer_name.find("noname-") == 0) {
+  if (monmap->get_epoch() == 0 && peer_name.find("noname-") == 0) {
     dout(10) << " renaming peer " << m->get_source_addr() << " "
             << peer_name << " -> " << m->name << " in my monmap"
             << dendl;
     monmap->rename(peer_name, m->name);
+  } else {
+    dout(10) << " peer name is " << peer_name << dendl;
   }
 
   // new initial peer?