monclient: kill unused wait_authenticate()

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index bdbaf21e2461b19f08eeab14bbc10759d013c6db..fd4509718e3bdadc3688842578c9cde0a8e439f5 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -478,23 +478,6 @@ void MonClient::handle_subscribe_ack(MMonSubscribeAck *m)
   delete m;
 }
 
-int MonClient::wait_authenticate(double timeout)
-{
-  Mutex::Locker l(monc_lock);
-  utime_t interval;
-  interval += timeout;
-
-  if (state == MC_STATE_HAVE_SESSION)
-    return 0;
-
-  if (cur_mon < 0)
-    _reopen_session();
-
-  int ret = auth_cond.WaitInterval(monc_lock, interval);
-  dout(0) << "wait_authenticate ended, returned " << ret << dendl;
-  return ret;
-}
-
 int MonClient::_check_auth_rotating()
 {
   if (state == MC_STATE_HAVE_SESSION && auth && auth->need_tickets()) {

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index c134d2b599a3a05d6c291450e3e98b172ea4c0f0..699dd378df195db309b7a29c3542ff9cf676a554 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -109,8 +109,7 @@ public:
   int _check_auth_rotating();
   int wait_auth_rotating(double timeout);
 
-  int authenticate(double timeout);
-  int wait_authenticate(double timeout);
+  int authenticate(double timeout=30.0);
 
   // mon subscriptions
 private: