]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/monmap: conditional optimization in build_from_host_list 8395/head
authorrenhwztetecs <rhwlyw@163.com>
Thu, 31 Mar 2016 12:13:34 +0000 (20:13 +0800)
committerhuanwen ren <ren.huanwen@zte.com.cn>
Fri, 1 Apr 2016 01:03:46 +0000 (09:03 +0800)
conditional optimization in build_from_host_list

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
src/mon/MonMap.cc

index 8341cac624a0241c7e401a821be34ebe986e1335..0efcc59e6fc0526bf94c3f8d7031029c46eb0b77 100644 (file)
@@ -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;
   }