Revert "mds: move MDSContext completion handling to finish method"

This reverts commit df404e03915765ef5c854a48556fd716161f3add.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 71c7be41b524dd0446f0a98fd8be09b950e6428b)

diff --git a/src/mds/MDSContext.cc b/src/mds/MDSContext.cc
index d1318957889c4c404c0e9aded0a7fce7837689b5..5b076e220c5b96aefb68d07957a346051ada62e5 100644 (file)
--- a/src/mds/MDSContext.cc
+++ b/src/mds/MDSContext.cc
@@ -20,12 +20,13 @@
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds
 
-void MDSContext::finish(int r) {
+void MDSContext::complete(int r) {
   MDSRank *mds = get_mds();
   ceph_assert(mds != nullptr);
   ceph_assert(ceph_mutex_is_locked_by_me(mds->mds_lock));
-  dout(10) << "MDSContext::finish: " << typeid(*this).name() << dendl;
+  dout(10) << "MDSContext::complete: " << typeid(*this).name() << dendl;
   mds->heartbeat_reset();
+  return Context::complete(r);
 }
 
 void MDSInternalContextWrapper::finish(int r)

diff --git a/src/mds/MDSContext.h b/src/mds/MDSContext.h
index cb0f1e29c093be1bfb9a47ec7c0a4370bbcc9cf5..6cea13e5c5780ffb1459d1fa44fe310b0933b1b4 100644 (file)
--- a/src/mds/MDSContext.h
+++ b/src/mds/MDSContext.h
@@ -45,7 +45,7 @@ template<template<typename> class A>
   using que_alloc = std::deque<MDSContext*, A<MDSContext*>>;
   using que = que_alloc<std::allocator>;
 
-  void finish(int r) override;
+  void complete(int r) override;
   virtual MDSRank *get_mds() = 0;
 };