From: Sage Weil <sage@redhat.com>
Date: Mon, 28 May 2018 18:50:07 +0000 (-0500)
Subject: mon/MonMap: use legacy rank order for all bootstrap monmaps
X-Git-Tag: v14.0.1~1257^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02117f1eb29666dbd822fe99e4fc27b54dfab8ca;p=ceph.git

mon/MonMap: use legacy rank order for all bootstrap monmaps

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

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 3cad9dea48ae..890289cf52e7 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -363,6 +363,7 @@ int MonMap::build_from_host_list(std::string hostlist, const std::string &prefix
 	!contains(name))
       add(name, addrs[i]);
   }
+  calc_legacy_ranks();
   return 0;
 }
 
@@ -409,6 +410,7 @@ void MonMap::set_initial_members(CephContext *cct,
       assert(contains(*p));
     }
   }
+  calc_legacy_ranks();
 }
 
 
@@ -449,6 +451,7 @@ int MonMap::build_initial(CephContext *cct, ostream& errout)
     }
     created = ceph_clock_now();
     last_changed = created;
+    calc_legacy_ranks();
     return 0;
   }
 
@@ -547,5 +550,6 @@ int MonMap::build_initial(CephContext *cct, ostream& errout)
   }
   created = ceph_clock_now();
   last_changed = created;
+  calc_legacy_ranks();
   return 0;
 }