From: Sage Weil <sage@inktank.com>
Date: Sun, 10 Mar 2013 06:12:00 +0000 (-0800)
Subject: mon/MonMap: don't crash on dup IP in mon host
X-Git-Tag: v0.59~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07820f032f53ca5dfb2dcb29f29a28ae2a24a499;p=ceph.git

mon/MonMap: don't crash on dup IP in mon host

If the mon_host line has an IP twice, we shouldn't crash.

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

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 5a9d6ce96bd..35615edeba6 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -160,7 +160,8 @@ int MonMap::build_from_host_list(std::string hostlist, std::string prefix)
 	addrs[i].set_port(CEPH_MON_PORT);
       string name = prefix;
       name += n;
-      add(name, addrs[i]);
+      if (!contains(addrs[i]))
+	add(name, addrs[i]);
     }
     if (addrs.empty())
       return -ENOENT;