mon: make bootstrap rank check more robust

If we search for myaddrs, then we will detect our rank properly if we were
[a,b] and the a addr got removed.

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

diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index 5a852807ddb77dca9cb5fcb03e5fe1ae0909084b..f5a230c712975661bc6632b57b5f57fd6b9feac7 100644 (file)
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@ -327,10 +327,17 @@ public:
   }
   int get_rank(const entity_addr_t& a) const {
     string n = get_name(a);
-    if (n.empty())
-      return -1;
-
-    return get_rank(n);
+    if (!n.empty()) {
+      return get_rank(n);
+    }
+    return -1;
+  }
+  int get_rank(const entity_addrvec_t& av) const {
+    string n = get_name(av);
+    if (!n.empty()) {
+      return get_rank(n);
+    }
+    return -1;
   }
   bool get_addr_name(const entity_addr_t& a, string& name) {
     if (addr_mons.count(a) == 0)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 793e037bc3dfef618ae6b190fbd9e166e60fff96..71a0b0e5b10787f009d875b3faf7e8ec329d9ff3 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1086,7 +1086,7 @@ void Monitor::bootstrap()
   dout(10) << "monmap " << *monmap << dendl;
 
   // note my rank
-  int newrank = monmap->get_rank(messenger->get_myaddr());
+  int newrank = monmap->get_rank(messenger->get_myaddrs());
   if (newrank < 0 && rank >= 0) {
     // was i ever part of the quorum?
     if (has_ever_joined) {