From: renhwztetecs <rhwlyw@163.com>
Date: Thu, 31 Mar 2016 12:13:34 +0000 (+0800)
Subject: mon/monmap: conditional optimization in build_from_host_list
X-Git-Tag: v11.0.0~857^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cf6b809b1a4b5572fecc7374d57dff664a75c0d;p=ceph.git

mon/monmap: conditional optimization in build_from_host_list

conditional optimization in build_from_host_list

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
---

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 8341cac624a0..0efcc59e6fc0 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -153,6 +153,8 @@ int MonMap::build_from_host_list(std::string hostlist, std::string prefix)
 {
   vector<entity_addr_t> addrs;
   if (parse_ip_port_vec(hostlist.c_str(), addrs)) {
+    if (addrs.empty())
+      return -ENOENT;
     for (unsigned i=0; i<addrs.size(); i++) {
       char n[2];
       n[0] = 'a' + i;
@@ -164,8 +166,6 @@ int MonMap::build_from_host_list(std::string hostlist, std::string prefix)
       if (!contains(addrs[i]))
 	add(name, addrs[i]);
     }
-    if (addrs.empty())
-      return -ENOENT;
     return 0;
   }