From 2c2e38e72132f1430f42068200472173a0917da0 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sun, 20 Jul 2014 08:22:22 -0700
Subject: [PATCH] mds: add finisher

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/mds/MDS.cc | 5 +++++
 src/mds/MDS.h  | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index c40fdb96a9d41..8245db4cd0f60 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -104,6 +104,7 @@ MDS::MDS(const std::string &n, Messenger *m, MonClient *mc) :
   monc(mc),
   clog(m->cct, messenger, &mc->monmap, LogClient::NO_FLAGS),
   op_tracker(cct, m->cct->_conf->mds_enable_op_tracker),
+  finisher(cct),
   sessionmap(this), asok_hook(NULL) {
 
   orig_argc = 0;
@@ -604,6 +605,8 @@ int MDS::init(MDSMap::DaemonState wanted_state)
   monc->set_want_keys(CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_OSD | CEPH_ENTITY_TYPE_MDS);
   monc->init();
 
+  finisher.start();
+
   // tell monc about log_client so it will know about mon session resets
   monc->set_log_client(&clog);
   
@@ -1816,6 +1819,8 @@ void MDS::suicide()
 
   mdlog->shutdown();
 
+  finisher.stop(); // no flushing
+
   // stop timers
   if (beacon_sender) {
     timer.cancel_event(beacon_sender);
diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index 493857a8cb4bd..fe3eab127389d 100644
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -30,6 +30,7 @@
 #include "common/Timer.h"
 #include "common/LogClient.h"
 #include "common/TrackedOp.h"
+#include "common/Finisher.h"
 
 #include "MDSMap.h"
 
@@ -183,6 +184,8 @@ class MDS : public Dispatcher, public md_config_obs_t {
   PerfCounters       *logger, *mlogger;
   OpTracker    op_tracker;
 
+  Finisher finisher;
+
   int orig_argc;
   const char **orig_argv;
 
-- 
2.39.5