From: Sage Weil <sage@inktank.com>
Date: Wed, 23 May 2012 18:25:46 +0000 (-0700)
Subject: monmap: return ENOENT from build_from_host_list when no mons
X-Git-Tag: v0.48argonaut~137^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab04d95ad5c0adb0d114bd3546ee6d37613a2018;p=ceph.git

monmap: return ENOENT from build_from_host_list when no mons

Make sure we return an error when no monitors are parsed.

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

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index ebff83763ae1..6dd8ec88c5a2 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -162,6 +162,8 @@ int MonMap::build_from_host_list(std::string hostlist, std::string prefix)
       name += n;
       add(name, addrs[i]);
     }
+    if (addrs.empty())
+      return -ENOENT;
     return 0;
   }
 
@@ -175,6 +177,9 @@ int MonMap::build_from_host_list(std::string hostlist, std::string prefix)
   if (!success)
     return -EINVAL;
 
+  if (addrs.empty())
+    return -ENOENT;
+
   for (unsigned i=0; i<addrs.size(); i++) {
     char n[2];
     n[0] = 'a' + i;