From e354f1b8ab76df1b154b3c0c46b5c09d2e5f4d68 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Fri, 4 Oct 2024 22:49:47 +0200
Subject: [PATCH] msg/MDSRank: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/mds/MDSRank.cc | 15 +++++++++++----
 src/mds/MDSRank.h  | 22 +++++++++-------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 53c595d7633cb..603c23bb39cc7 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -12,25 +12,33 @@
  *
  */
 
-#include <array>
-#include <string_view>
+#include "MDSRank.h"
+#include "osdc/Journaler.h"
+
 #include <typeinfo>
 #include "common/debug.h"
 #include "common/errno.h"
+#include "common/fair_mutex.h"
 #include "common/likely.h"
+#include "common/Timer.h"
 #include "common/async/blocked_completion.h"
 #include "common/cmdparse.h"
+#include "log/Log.h"
 
 #include "messages/MClientRequestForward.h"
 #include "messages/MMDSLoadTargets.h"
+#include "messages/MMDSMap.h"
 #include "messages/MMDSTableRequest.h"
 #include "messages/MMDSMetrics.h"
 
 #include "mgr/MgrClient.h"
 
+#include "MDCache.h"
+#include "MDLog.h"
 #include "MDSDaemon.h"
 #include "MDSMap.h"
 #include "MetricAggregator.h"
+#include "Server.h"
 #include "SnapClient.h"
 #include "SnapServer.h"
 #include "MDBalancer.h"
@@ -38,14 +46,13 @@
 #include "Locker.h"
 #include "InoTable.h"
 #include "mon/MonClient.h"
+#include "osdc/Objecter.h"
 #include "common/HeartbeatMap.h"
 #include "ScrubStack.h"
 #include "events/ESubtreeMap.h"
 #include "events/ELid.h"
 #include "Mutation.h"
 
-#include "MDSRank.h"
-
 #include "QuiesceDbManager.h"
 #include "QuiesceAgent.h"
 
diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h
index 9f31b00900ce8..e6e8c2f2eeca0 100644
--- a/src/mds/MDSRank.h
+++ b/src/mds/MDSRank.h
@@ -18,36 +18,28 @@
 #include <atomic>
 #include <string_view>
 
+#include "common/admin_socket.h" // for asok_finisher
 #include "common/DecayCounter.h"
 #include "common/LogClient.h"
-#include "common/Timer.h"
-#include "common/fair_mutex.h"
-#include "common/TrackedOp.h"
-#include "common/ceph_mutex.h"
 
 #include "include/common_fwd.h"
 
-#include "messages/MClientRequest.h"
-#include "messages/MCommand.h"
-#include "messages/MMDSMap.h"
-
 #include "Beacon.h"
 #include "DamageTable.h"
 #include "MDSMap.h"
 #include "SessionMap.h"
-#include "MDCache.h"
-#include "MDLog.h"
 #include "MDSContext.h"
 #include "PurgeQueue.h"
-#include "Server.h"
 #include "MetricsHandler.h"
-#include "osdc/Journaler.h"
-#include "MDSMetaRequest.h"
+#include "mon/MonClient.h"
 
 // Full .h import instead of forward declaration for PerfCounter, for the
 // benefit of those including this header and using MDSRank::logger
 #include "common/perf_counters.h"
 
+class MDSMetaRequest;
+class MMDSMap;
+
 namespace boost::asio { class io_context; }
 
 enum {
@@ -135,6 +127,9 @@ namespace ceph {
   struct heartbeat_handle_d;
 }
 
+template <class Mutex>
+class CommonSafeTimer;
+
 class Locker;
 class MDCache;
 class MDLog;
@@ -150,6 +145,7 @@ class Objecter;
 class MonClient;
 class MgrClient;
 class Finisher;
+class Server;
 class ScrubStack;
 class C_ExecAndReply;
 class QuiesceDbManager;
-- 
2.39.5