From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 7 May 2020 08:44:14 +0000 (+0800)
Subject: tools/cephfs: don't bind to public_addr
X-Git-Tag: v15.2.13~8^2~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f7dbdaf841e7005bcd9d9fa61d066cfe7c509e7;p=ceph.git

tools/cephfs: don't bind to public_addr

In some setup, binding to public_addr causes error:
 NetHandler create_socket couldn't create socket (97) Address family not supported by protocol

Fixes: https://tracker.ceph.com/issues/41034
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 6d2d51499838dc5f34376c6605ec246db3547ceb)

Conflicts:
	src/ceph_syn.cc
	src/tools/cephfs/MDSUtility.cc
- octopus does not have poolctx
---

diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc
index 50e26f2815a..5c469474d7f 100644
--- a/src/ceph_syn.cc
+++ b/src/ceph_syn.cc
@@ -63,7 +63,6 @@ int main(int argc, const char **argv, char *envp[])
   for (int i=0; i<num_client; i++) {
     messengers[i] = Messenger::create_client_messenger(g_ceph_context,
 						       "synclient");
-    messengers[i]->bind(g_conf()->public_addr);
     mclients[i] = new MonClient(g_ceph_context);
     mclients[i]->build_initial_monmap();
     auto client = new StandaloneClient(messengers[i], mclients[i]);
diff --git a/src/tools/cephfs/MDSUtility.cc b/src/tools/cephfs/MDSUtility.cc
index eb323a2308c..b44c4fdd0b9 100644
--- a/src/tools/cephfs/MDSUtility.cc
+++ b/src/tools/cephfs/MDSUtility.cc
@@ -48,10 +48,6 @@ MDSUtility::~MDSUtility()
 int MDSUtility::init()
 {
   // Initialize Messenger
-  int r = messenger->bind(g_conf()->public_addr);
-  if (r < 0)
-    return r;
-
   messenger->start();
 
   objecter->set_client_incarnation(0);
@@ -72,7 +68,7 @@ int MDSUtility::init()
   monc->set_want_keys(CEPH_ENTITY_TYPE_MON|CEPH_ENTITY_TYPE_OSD|CEPH_ENTITY_TYPE_MDS);
   monc->set_messenger(messenger);
   monc->init();
-  r = monc->authenticate();
+  int r = monc->authenticate();
   if (r < 0) {
     derr << "Authentication failed, did you specify an MDS ID with a valid keyring?" << dendl;
     monc->shutdown();