]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
commom: make cluster_network work. 28248/head
authorJianpeng Ma <jianpeng.ma@intel.com>
Fri, 26 Apr 2019 08:44:20 +0000 (16:44 +0800)
committerPrashant D <pdhange@redhat.com>
Sun, 26 May 2019 23:53:46 +0000 (19:53 -0400)
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)

src/common/pick_address.cc

index 4b927ae1e2aeb0065ad620facafbb8f5e689830f..4e9f6174a0423cc4c1766e0a45863a463fb2bb9e 100644 (file)
@@ -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)) {