From 6e7e13e07b6afb2d453fcac52ce0f569e315292e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 29 Oct 2024 21:17:25 +0100 Subject: [PATCH] mgr/DaemonServer: include cleanup Signed-off-by: Max Kellermann --- src/mgr/DaemonServer.cc | 13 +++++++++++-- src/mgr/DaemonServer.h | 16 +++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index ca335a744d496..5cd4dd00a3855 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -12,8 +12,9 @@ */ #include "DaemonServer.h" -#include -#include "mgr/Mgr.h" +#include "DaemonState.h" +#include "Mgr.h" +#include "MgrSession.h" #include "include/stringify.h" #include "include/str_list.h" @@ -25,7 +26,9 @@ #include "mgr/OSDPerfMetricCollector.h" #include "mgr/MDSPerfMetricCollector.h" #include "mgr/MgrOpRequest.h" +#include "mon/MonClient.h" #include "mon/MonCommand.h" +#include "msg/Messenger.h" #include "messages/MMgrOpen.h" #include "messages/MMgrUpdate.h" @@ -41,6 +44,12 @@ #include "messages/MOSDForceRecovery.h" #include "common/errno.h" #include "common/pick_address.h" +#include "common/TextTable.h" +#include "crush/CrushWrapper.h" + +#include + +#include #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr diff --git a/src/mgr/DaemonServer.h b/src/mgr/DaemonServer.h index 1193805def572..beb396115f3c3 100644 --- a/src/mgr/DaemonServer.h +++ b/src/mgr/DaemonServer.h @@ -16,25 +16,25 @@ #include "PyModuleRegistry.h" +#include #include #include -#include #include "common/ceph_mutex.h" #include "common/LogClient.h" #include "common/Timer.h" - -#include -#include +#include "common/TrackedOp.h" // for class OpTracker +#include "include/utime.h" #include "ServiceMap.h" -#include "MgrSession.h" -#include "DaemonState.h" #include "MetricCollector.h" #include "OSDPerfMetricCollector.h" #include "MDSPerfMetricCollector.h" -#include "MgrOpRequest.h" +#include + +class DaemonStateIndex; +class Messenger; class MMgrReport; class MMgrOpen; class MMgrUpdate; @@ -42,7 +42,9 @@ class MMgrClose; class MMonMgrReport; class MCommand; class MMgrCommand; +class MgrSession; struct MonCommand; +class MonClient; class CommandContext; struct OSDPerfMetricQuery; struct MDSPerfMetricQuery; -- 2.39.5