mds: adapt to new objecter interface

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

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 66995704029144352d0859637ea822821e62a972..8ce9fe968f4080fbb348cda44dc97f4ee3e099d3 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -116,7 +116,7 @@ MDS::MDS(const std::string &n, Messenger *m, MonClient *mc) :
   mdsmap = new MDSMap;
   osdmap = new OSDMap;
 
-  objecter = new Objecter(m->cct, messenger, monc, osdmap, mds_lock, timer,
+  objecter = new Objecter(m->cct, messenger, monc, osdmap,
                          0, 0);
   objecter->unset_honor_osdmap_full();
 
@@ -616,7 +616,7 @@ int MDS::init(MDSMap::DaemonState wanted_state)
   while (monc->wait_auth_rotating(30.0) < 0) {
     derr << "unable to obtain rotating service keys; retrying" << dendl;
   }
-  objecter->init_unlocked();
+  objecter->init();
 
   mds_lock.Lock();
   if (want_state == CEPH_MDS_STATE_DNE) {
@@ -624,8 +624,6 @@ int MDS::init(MDSMap::DaemonState wanted_state)
     return 0;
   }
 
-  objecter->init_locked();
-
   monc->sub_want("mdsmap", 0, 0);
   monc->renew_subs();
 
@@ -1834,8 +1832,8 @@ void MDS::suicide()
   // shut down cache
   mdcache->shutdown();
 
-  if (objecter->initialized)
-    objecter->shutdown_locked();
+  if (objecter->initialized.read())
+    objecter->shutdown();
 
   monc->shutdown();
 

diff --git a/src/tools/cephfs/MDSUtility.cc b/src/tools/cephfs/MDSUtility.cc
index 4d6176aced056203eb93fa44e127f84c9ec1c951..3f59c92932a2181dffb0e6808666d4e25c8edee8 100644 (file)
--- a/src/tools/cephfs/MDSUtility.cc
+++ b/src/tools/cephfs/MDSUtility.cc
@@ -28,7 +28,7 @@ MDSUtility::MDSUtility() :
   messenger = Messenger::create(g_ceph_context, entity_name_t::CLIENT(), "mds", getpid());
   mdsmap = new MDSMap();
   osdmap = new OSDMap();
-  objecter = new Objecter(g_ceph_context, messenger, monc, osdmap, lock, timer, 0, 0);
+  objecter = new Objecter(g_ceph_context, messenger, monc, osdmap, 0, 0);
 }
 
 
@@ -77,10 +77,7 @@ int MDSUtility::init()
 
   // Initialize Objecter and wait for OSD map
   objecter->set_client_incarnation(0);
-  objecter->init_unlocked();
-  lock.Lock();
-  objecter->init_locked();
-  lock.Unlock();
+  objecter->init();
   objecter->wait_for_osd_map();
   timer.init();
 
@@ -111,9 +108,8 @@ void MDSUtility::shutdown()
 {
   lock.Lock();
   timer.shutdown();
-  objecter->shutdown_locked();
+  objecter->shutdown();
   lock.Unlock();
-  objecter->shutdown_unlocked();
   monc->shutdown();
   messenger->shutdown();
   messenger->wait();