librados: adapt to new objecter interface

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 83f5bbef01cb39e0a6c3fa292e5481e51e6d3655..10f2679b3be1e7ea047852800ff5204e0b9c1f7d 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -236,7 +236,7 @@ int librados::RadosClient::connect()
   ldout(cct, 1) << "starting objecter" << dendl;
 
   err = -ENOMEM;
-  objecter = new Objecter(cct, messenger, &monclient, &osdmap, lock, timer,
+  objecter = new Objecter(cct, messenger, &monclient, &osdmap,
                          cct->_conf->rados_mon_op_timeout,
                          cct->_conf->rados_osd_op_timeout);
   if (!objecter)
@@ -267,13 +267,12 @@ int librados::RadosClient::connect()
   }
   messenger->set_myname(entity_name_t::CLIENT(monclient.get_global_id()));
 
-  objecter->init_unlocked();
+  objecter->set_client_incarnation(0);
+  objecter->init();
   lock.Lock();
 
   timer.init();
 
-  objecter->set_client_incarnation(0);
-  objecter->init_locked();
   monclient.renew_subs();
 
   finisher.start();
@@ -305,7 +304,6 @@ void librados::RadosClient::shutdown()
   bool need_objecter = false;
   if (objecter && state == CONNECTED) {
     need_objecter = true;
-    objecter->shutdown_locked();
   }
   state = DISCONNECTED;
   instance_id = 0;
@@ -313,7 +311,7 @@ void librados::RadosClient::shutdown()
   lock.Unlock();
   monclient.shutdown();
   if (need_objecter)
-    objecter->shutdown_unlocked();
+    objecter->shutdown();
   if (messenger) {
     messenger->shutdown();
     messenger->wait();