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

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 907c7a72b96ff5d23ce3ddd87fc2c4a0d6ef0325..b7ab456fef6f3b0ca67fffd87e381678204d4e10 100644 (file)
--- 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 5f58c60a6d3040be842250322fb234804536cc09..b3863a5ffa2553f96ff6d634ae0b5c7c31443298 100644 (file)
--- 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();