From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Fri, 26 Apr 2019 08:44:20 +0000 (+0800)
Subject: commom: make cluster_network work.
X-Git-Tag: v14.2.2~106^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a44cf3b2dc59038b8b3f8f2fb455c2c0f52a2e1;p=ceph.git

commom: make cluster_network work.

This temporary parameter make address is zero. So make cluster_addr is
equal public_addr and make cluster_network disable.

Fixes: https://tracker.ceph.com/issues/39623

Reported-by: Jiang Xu <xu.jiang@dccsh.icbc.com.cn>
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 1b17061bf1d047c2d1f3c6b513a5e5ab4a48f350)
---

diff --git a/src/common/pick_address.cc b/src/common/pick_address.cc
index 4b927ae1e2ae..4e9f6174a042 100644
--- a/src/common/pick_address.cc
+++ b/src/common/pick_address.cc
@@ -383,7 +383,6 @@ int pick_addresses(
 
   // ipv4 and/or ipv6?
   if (addrs->v.empty()) {
-    entity_addr_t addr;
     addr.set_type(entity_addr_t::TYPE_MSGR2);
     if ((ipv & CEPH_PICK_ADDRESS_IPV4) &&
 	(flags & CEPH_PICK_ADDRESS_PREFER_IPV4)) {