From: Michal Jarzabek <stiopa@gmail.com>
Date: Thu, 21 Jul 2016 13:29:58 +0000 (+0100)
Subject: mon/MonClient: move C_CancelMonCommand to cc file
X-Git-Tag: ses5-milestone5~210^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5dce39df0d21b518526541e330922b79ed09c891;p=ceph.git

mon/MonClient: move C_CancelMonCommand to cc file

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 6ae7b4574065..5204320a0daa 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -1008,6 +1008,16 @@ int MonClient::start_mon_command(const vector<string>& cmd,
   r->prs = outs;
   r->onfinish = onfinish;
   if (cct->_conf->rados_mon_op_timeout > 0) {
+    class C_CancelMonCommand : public Context
+    {
+      uint64_t tid;
+      MonClient *monc;
+      public:
+      C_CancelMonCommand(uint64_t tid, MonClient *monc) : tid(tid), monc(monc) {}
+      void finish(int r) {
+	monc->_cancel_mon_command(tid, -ETIMEDOUT);
+      }
+    };
     r->ontimeout = new C_CancelMonCommand(r->tid, this);
     timer.add_event_after(cct->_conf->rados_mon_op_timeout, r->ontimeout);
   }
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 4e08ceb6d6c0..4d823aea2a05 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -410,17 +410,6 @@ private:
   };
   map<uint64_t,MonCommand*> mon_commands;
 
-  class C_CancelMonCommand : public Context
-  {
-    uint64_t tid;
-    MonClient *monc;
-  public:
-    C_CancelMonCommand(uint64_t tid, MonClient *monc) : tid(tid), monc(monc) {}
-    void finish(int r) {
-      monc->_cancel_mon_command(tid, -ETIMEDOUT);
-    }
-  };
-
   void _send_command(MonCommand *r);
   void _resend_mon_commands();
   int _cancel_mon_command(uint64_t tid, int r);