From cd9d8622686c37fe92479191b4137d2223bd694a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 21 May 2012 13:14:50 -0700 Subject: [PATCH] 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 --- src/mon/Monitor.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 25c4a499b2fc7..f2188c8c2f382 100644 --- 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? -- 2.39.5