]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson: ignore v2 only addvec
authorKefu Chai <kchai@redhat.com>
Thu, 10 Jan 2019 13:14:28 +0000 (21:14 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 18 Jan 2019 04:32:21 +0000 (12:32 +0800)
crimson need to be v2 compatible. but let's leave this for another PR.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/mon/MonClient.cc

index ff32b97d5536ac7a298f9d56e38ad7e7859d4cc2..c139adba7a7f442ff3c50aa77d96f4e5a6054282 100644 (file)
@@ -458,9 +458,13 @@ std::vector<unsigned> Client::get_random_mons(unsigned n) const
     }
   }
   vector<unsigned> ranks;
-  for (const auto& m : monmap.mon_info) {
-    if (m.second.priority == min_priority) {
-      ranks.push_back(monmap.get_rank(m.first));
+  for (auto [name, info] : monmap.mon_info) {
+    // TODO: #msgr-v2
+    if (info.public_addrs.legacy_addr().is_blank_ip()) {
+      continue;
+    }
+    if (info.priority == min_priority) {
+      ranks.push_back(monmap.get_rank(name));
     }
   }
   std::random_device rd;