From: Sage Weil <sage@newdream.net>
Date: Tue, 10 Nov 2009 00:08:50 +0000 (-0800)
Subject: mds, osd: call monc->authenticate(), not wait_authenticate()
X-Git-Tag: v0.18~131
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2412a49b9de8964d92197020f32e79fb790a4b8a;p=ceph.git

mds, osd: call monc->authenticate(), not wait_authenticate()
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 907c7a72b96f..b7ab456fef6f 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -383,9 +383,7 @@ int MDS::init()
   monc->set_want_keys(CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_OSD | CEPH_ENTITY_TYPE_MDS);
   monc->init();
 
-  monc->get_monmap();
-
-  monc->wait_authenticate(30.0);
+  monc->authenticate(30.0);
   monc->wait_auth_rotating(30.0);
 
   mds_lock.Lock();
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5f58c60a6d30..b3863a5ffa25 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -423,11 +423,10 @@ int OSD::init()
   monc->init();
 
   monc->sub_want("monmap", 0);
-  monc->renew_subs();  
 
   osd_lock.Unlock();
 
-  monc->wait_authenticate(30.0);
+  monc->authenticate(30.0);
   monc->wait_auth_rotating(30.0);
 
   osd_lock.Lock();