osd, mds: don't time out authenticate()

Still need to fix wait_auth_rotating....

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index bc0080ad9f1483d61a0a2bcf22da3595ce41fca6..7e84f11c476d7054635568dc0c2c77e83d55eb98 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -391,7 +391,7 @@ int MDS::init()
   monc->set_want_keys(CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_OSD | CEPH_ENTITY_TYPE_MDS);
   monc->init();
 
-  monc->authenticate(30.0);
+  monc->authenticate();
   monc->wait_auth_rotating(30.0);
 
   mds_lock.Lock();

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6fd22cf97654e232fe26fa826526a4561e320028..c19f8be3f663f0f1b90e49dd50a3c7786498b07f 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -452,7 +452,7 @@ int OSD::init()
 
   osd_lock.Unlock();
 
-  monc->authenticate(30.0);
+  monc->authenticate();
   monc->wait_auth_rotating(30.0);
 
   osd_lock.Lock();