From 213bd010029afa4487d6ef3f4fd8bd75173bd935 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 4 Feb 2010 14:35:21 -0800
Subject: [PATCH] monclient: return authetnication error

---
 src/librados.cc      | 6 +++++-
 src/mon/MonClient.cc | 5 ++---
 src/mon/MonClient.h  | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/librados.cc b/src/librados.cc
index e40b76b97369e..d3a76d12f747f 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -318,7 +318,11 @@ bool RadosClient::init()
   dout(1) << "iit" << dendl;
   monclient.init();
 
-  monclient.authenticate(g_conf.client_mount_timeout);
+  int err = monclient.authenticate(g_conf.client_mount_timeout);
+  if (err) {
+    dout(0) << *g_conf.entity_name << " authentication error " << strerror(-err) << dendl;
+    return false;
+  }
   messenger->set_myname(entity_name_t::CLIENT(monclient.get_global_id()));
 
   lock.Lock();
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 63995d354f8d0..bdbaf21e2461b 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -273,7 +273,7 @@ int MonClient::authenticate(double timeout)
     _reopen_session();
 
   while (state != MC_STATE_HAVE_SESSION && !authenticate_err)
-    authenticate_cond.Wait(monc_lock);
+    auth_cond.Wait(monc_lock);
 
   if (state == MC_STATE_HAVE_SESSION) {
     dout(5) << "authenticate success, global_id " << global_id << dendl;
@@ -329,7 +329,6 @@ void MonClient::handle_auth(MAuthReply *m)
 	_send_mon_message(waiting_for_session.front());
 	waiting_for_session.pop_front();
       }
-      authenticate_cond.SignalAll();
     }
   
     _check_auth_rotating();
@@ -491,7 +490,7 @@ int MonClient::wait_authenticate(double timeout)
   if (cur_mon < 0)
     _reopen_session();
 
-  int ret = authenticate_cond.WaitInterval(monc_lock, interval);
+  int ret = auth_cond.WaitInterval(monc_lock, interval);
   dout(0) << "wait_authenticate ended, returned " << ret << dendl;
   return ret;
 }
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index e10489f5ef18d..c134d2b599a3a 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -94,7 +94,6 @@ private:
   // authenticate
 private:
   Cond map_cond;
-  Cond authenticate_cond;
   int authenticate_err;
 
   list<Message*> waiting_for_session;
-- 
2.39.5