mon: simplify suicide when removed from map

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index f5d25e6201cc5527ff233ea9b79dd5b0f3534ede..f4f2aa6b2f20a65198e439a83cd28c01784e6877 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -85,15 +85,12 @@ bool MonmapMonitor::update_from_paxos()
   }
 
   int rank = mon->monmap->get_rank(mon->name);
-  if (rank < 0) {
-    dout(10) << "Assuming temporary id=mon." << mon->monmap->size() << " for shutdown purposes" << dendl;
-    mon->messenger->set_myname(entity_name_t::MON(mon->monmap->size()));
-    mon->monmap->add(mon->name, mon->myaddr);
-    mon->shutdown();
-    return true;
+  if (rank < 0 && mon->rank >= 0) {
+    dout(0) << " removed from monmap, suicide." << dendl;
+    exit(0);
   }
-
   if (rank != mon->rank) {
+    dout(0) << " my rank is now " << rank << " (was " << mon->rank << ")" << dendl;
     mon->messenger->set_myname(entity_name_t::MON(rank));
     mon->rank = rank;
   }