From: Yao Zongyou <yaozongyou@vip.qq.com>
Date: Tue, 14 Aug 2018 03:07:18 +0000 (+0800)
Subject: mon/MonClient: use mon_client_ping_timeout during ping_monitor
X-Git-Tag: v14.0.1~560^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c18cfb734e31ffc3b81c09e92055d85fdb17fe68;p=ceph.git

mon/MonClient: use mon_client_ping_timeout during ping_monitor

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 6bc91e18fdf8..3103a5c80f99 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -233,7 +233,7 @@ int MonClient::ping_monitor(const string &mon_id, string *result_reply)
   con->send_message(new MPing);
 
   pinger->lock.Lock();
-  int ret = pinger->wait_for_reply(cct->_conf->client_mount_timeout);
+  int ret = pinger->wait_for_reply(cct->_conf->mon_client_ping_timeout);
   if (ret == 0) {
     ldout(cct,10) << __func__ << " got ping reply" << dendl;
   } else {