mds/MD{Cache,SRank}: move classes to Retry{Message,Request}.h

Prepare for eliminating the header dependency on MDSContext.h.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 8ef4bed9ec7fcf904553c4a4f2b66ebe0ad0d810..bf21af21375ba890429ec510ce3b5894ba8dc3a2 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -26,6 +26,8 @@
 #include "MDLog.h"
 #include "MDSRank.h"
 #include "MDSMap.h"
+#include "RetryMessage.h"
+#include "RetryRequest.h"
 #include "SimpleLock.h"
 #include "SnapRealm.h"
 #include "messages/MClientCaps.h"

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index c2389c3d3015245088850549d1871925dcb8c679..9a07f944986b630a6bb1c2ec1700855822cf1955 100644 (file)
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -13,6 +13,7 @@
  */
 
 #include "MDBalancer.h"
+#include "RetryMessage.h"
 
 #include "include/compat.h"
 #include "mdstypes.h"

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 4676355afd42e88e4a2c0fabbe8ade90faa8251d..5e7bcd2a376a85170acc3077ab78949b03d30f55 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -13,6 +13,8 @@
  */
 
 #include "MDCache.h"
+#include "RetryMessage.h"
+#include "RetryRequest.h"
 
 #include <errno.h>
 

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index beb5e0c58b70aa527e33b88669552d418af76d04..00faba916ca12565ba6d18a30cc91dd1aa719c79 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -1599,26 +1599,6 @@ private:
   std::chrono::milliseconds quiesce_sleep;
 };
 
-class C_MDS_RetryRequest : public MDSInternalContext {
-  MDCache *cache;
-  MDRequestRef mdr;
- public:
-  C_MDS_RetryRequest(MDCache *c, const MDRequestRef& r) :
-    MDSInternalContext(c->mds), cache(c), mdr(r) {}
-  void finish(int r) override;
-};
-
-class CF_MDS_RetryRequestFactory : public MDSContextFactory {
-public:
-  CF_MDS_RetryRequestFactory(MDCache *cache, const MDRequestRef& mdr, bool dl) :
-    mdcache(cache), mdr(mdr), drop_locks(dl) {}
-  MDSContext *build() override;
-private:
-  MDCache *mdcache;
-  MDRequestRef mdr;
-  bool drop_locks;
-};
-
 /**
  * Only for contexts called back from an I/O completion
  *

diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h
index e6e8c2f2eeca0b2dddccc70543dccde221a1c1ad..0c0cf8fe69f480a8533887f6c03a448f212da62c 100644 (file)
--- a/src/mds/MDSRank.h
+++ b/src/mds/MDSRank.h
@@ -673,30 +673,6 @@ private:
     std::atomic_bool m_is_active = false; /* accessed outside mds_lock */
 };
 
-class C_MDS_RetryMessage : public MDSInternalContext {
-public:
-  C_MDS_RetryMessage(MDSRank *mds, const cref_t<Message> &m)
-    : MDSInternalContext(mds), m(m) {}
-  void finish(int r) override {
-    get_mds()->retry_dispatch(m);
-  }
-protected:
-  cref_t<Message> m;
-};
-
-class CF_MDS_RetryMessageFactory : public MDSContextFactory {
-public:
-  CF_MDS_RetryMessageFactory(MDSRank *mds, const cref_t<Message> &m)
-    : mds(mds), m(m) {}
-
-  MDSContext *build() {
-    return new C_MDS_RetryMessage(mds, m);
-  }
-private:
-  MDSRank *mds;
-  cref_t<Message> m;
-};
-
 /**
  * The aspect of MDSRank exposed to MDSDaemon but not subsystems: i.e.
  * the service/dispatcher stuff like init/shutdown that subsystems should

diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc
index 0006d13692ca1931c8b0e1de0c54a35e27a87f34..0f96028d75445d45c40f956107c1db85adfb020a 100644 (file)
--- a/src/mds/MDSTableClient.cc
+++ b/src/mds/MDSTableClient.cc
@@ -16,6 +16,7 @@
 #include "MDSMap.h"
 
 #include "MDSContext.h"
+#include "RetryMessage.h"
 #include "msg/Messenger.h"
 
 #include "messages/MMDSTableRequest.h"

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 328ccf3a92ba70214072fecf0e06d867deb4937e..444db550c4732babeadae0ac7ec6fc6ad2d77500 100644 (file)
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -19,6 +19,7 @@
 #include "CDir.h"
 #include "CDentry.h"
 #include "Locker.h"
+#include "RetryMessage.h"
 #include "Server.h"
 
 #include "MDBalancer.h"

diff --git a/src/mds/RetryMessage.h b/src/mds/RetryMessage.h
new file mode 100644 (file)
index 0000000..87ec6de
--- /dev/null
+++ b/src/mds/RetryMessage.h
@@ -0,0 +1,43 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2015 Red Hat
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software 
+ * Foundation.  See file COPYING.
+ * 
+ */
+
+#pragma once
+
+#include "MDSContext.h"
+#include "MDSRank.h"
+#include "msg/Message.h"
+
+class C_MDS_RetryMessage : public MDSInternalContext {
+public:
+  C_MDS_RetryMessage(MDSRank *mds, const cref_t<Message> &m)
+    : MDSInternalContext(mds), m(m) {}
+  void finish(int r) override {
+    get_mds()->retry_dispatch(m);
+  }
+protected:
+  cref_t<Message> m;
+};
+
+class CF_MDS_RetryMessageFactory : public MDSContextFactory {
+public:
+  CF_MDS_RetryMessageFactory(MDSRank *mds, const cref_t<Message> &m)
+    : mds(mds), m(m) {}
+
+  MDSContext *build() {
+    return new C_MDS_RetryMessage(mds, m);
+  }
+private:
+  MDSRank *mds;
+  cref_t<Message> m;
+};

diff --git a/src/mds/RetryRequest.h b/src/mds/RetryRequest.h
new file mode 100644 (file)
index 0000000..d913271
--- /dev/null
+++ b/src/mds/RetryRequest.h
@@ -0,0 +1,38 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software 
+ * Foundation.  See file COPYING.
+ * 
+ */
+
+#pragma once
+
+#include "MDCache.h"
+#include "MDSContext.h"
+
+class C_MDS_RetryRequest : public MDSInternalContext {
+  MDCache *cache;
+  MDRequestRef mdr;
+ public:
+  C_MDS_RetryRequest(MDCache *c, const MDRequestRef& r) :
+    MDSInternalContext(c->mds), cache(c), mdr(r) {}
+  void finish(int r) override;
+};
+
+class CF_MDS_RetryRequestFactory : public MDSContextFactory {
+public:
+  CF_MDS_RetryRequestFactory(MDCache *cache, const MDRequestRef& mdr, bool dl) :
+    mdcache(cache), mdr(mdr), drop_locks(dl) {}
+  MDSContext *build() override;
+private:
+  MDCache *mdcache;
+  MDRequestRef mdr;
+  bool drop_locks;
+};

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index a5efe7732445c66705d408a22086d4bb0f0086c0..61cf447c720fa43ab896f8fb632fe0c5939eb7c2 100644 (file)
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -14,6 +14,7 @@
 
 #include "ScrubStack.h"
 #include "CDir.h"
+#include "RetryMessage.h"
 #include "SnapRealm.h"
 #include "common/debug.h"
 #include "common/Formatter.h"

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 4c68e0b06c923b6e17e94266dfd5442282c70b77..a6d5bcca1cce25d12b96b03473362f75d61a7c8d 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -13,6 +13,8 @@
  */
 
 #include "Server.h"
+#include "RetryMessage.h"
+#include "RetryRequest.h"
 #include "BatchOp.h"
 
 #include <boost/lexical_cast.hpp>