From: Kefu Chai <kchai@redhat.com>
Date: Thu, 10 Jan 2019 13:14:28 +0000 (+0800)
Subject: crimson: ignore v2 only addvec
X-Git-Tag: v14.1.0~356^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7875183c76490499cbcd5bc43f8eeb9f4304b802;p=ceph.git

crimson: ignore v2 only addvec

crimson need to be v2 compatible. but let's leave this for another PR.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index ff32b97d5536..c139adba7a7f 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -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;