From 1ff3bdea3da6761a52b75da18bbac5ca6694b141 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 15 Mar 2019 16:07:14 +0800 Subject: [PATCH] mon/MonMap: kill dead msgr type checking which is unreachable. Signed-off-by: xie xingguo --- src/mon/MonMap.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc index 20d956141bd..ab99b50ac67 100644 --- a/src/mon/MonMap.cc +++ b/src/mon/MonMap.cc @@ -363,9 +363,7 @@ void MonMap::_add_ambiguous_addr(const string& name, // a v1: or v2: prefix was specified if (addr.get_port() == 0) { // use default port - if (addr.get_type() == entity_addr_t::TYPE_ANY) { - addr.set_port(CEPH_MON_PORT_IANA); - } else if (addr.get_type() == entity_addr_t::TYPE_LEGACY) { + if (addr.get_type() == entity_addr_t::TYPE_LEGACY) { addr.set_port(CEPH_MON_PORT_LEGACY); } else if (addr.get_type() == entity_addr_t::TYPE_MSGR2) { addr.set_port(CEPH_MON_PORT_IANA); -- 2.39.5