Merge pull request ceph#61607 from MaxKellermann/mgr_includes

mgr: include cleanup

Reviewed-by: Ilya Dryomov <[email protected]>

Author: idryomov

src/mgr/ActivePyModules.cc

@@ -19,6 +19,7 @@
 #include <rocksdb/version.h>
 
 #include "common/errno.h"
+#include "crush/CrushWrapper.h"
 #include "include/stringify.h"
 
 #include "mon/MonMap.h"

src/mgr/BaseMgrStandbyModule.cc

@@ -16,6 +16,7 @@
 
 #include "StandbyPyModules.h"
 #include "PyFormatter.h"
+#include "common/debug.h"
 
 
 #define dout_context g_ceph_context

src/mgr/ClusterState.cc

@@ -11,11 +11,11 @@
  * Foundation.  See file COPYING.
  */
 
+#include "mgr/ClusterState.h"
 #include "messages/MMgrDigest.h"
 #include "messages/MMonMgrReport.h"
 #include "messages/MPGStats.h"
 
-#include "mgr/ClusterState.h"
 #include <time.h>
 #include <boost/range/adaptor/reversed.hpp>
 

src/mgr/DaemonHealthMetricCollector.cc

@@ -1,8 +1,12 @@
+#include "DaemonHealthMetricCollector.h"
+
 #include <fmt/format.h>
 
 #include "include/health.h"
 #include "include/types.h"
-#include "DaemonHealthMetricCollector.h"
+
+#include <sstream>
+#include <vector>
 
 namespace {
 

src/mgr/DaemonHealthMetricCollector.h

@@ -1,9 +1,9 @@
 #pragma once
 
+#include "DaemonHealthMetric.h"
+
 #include <memory>
-#include <string>
 
-#include "DaemonHealthMetric.h"
 #include "DaemonKey.h"
 #include "mon/health_check.h"
 

src/mgr/DaemonServer.cc

@@ -12,8 +12,9 @@
  */
 
 #include "DaemonServer.h"
-#include <boost/algorithm/string.hpp>
-#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 <boost/algorithm/string.hpp>
+
+#include <iomanip>
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr

src/mgr/DaemonServer.h

@@ -16,33 +16,35 @@
 
 #include "PyModuleRegistry.h"
 
+#include <map>
 #include <set>
 #include <string>
-#include <boost/variant.hpp>
 
 #include "common/ceph_mutex.h"
 #include "common/LogClient.h"
 #include "common/Timer.h"
-
-#include <msg/Messenger.h>
-#include <mon/MonClient.h>
+#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 <boost/scoped_ptr.hpp>
+
+class DaemonStateIndex;
+class Messenger;
 class MMgrReport;
 class MMgrOpen;
 class MMgrUpdate;
 class MMgrClose;
 class MMonMgrReport;
 class MCommand;
 class MMgrCommand;
+class MgrSession;
 struct MonCommand;
+class MonClient;
 class CommandContext;
 struct OSDPerfMetricQuery;
 struct MDSPerfMetricQuery;

src/mgr/DaemonState.cc

@@ -17,6 +17,8 @@
 
 #include "MgrSession.h"
 #include "include/stringify.h"
+#include "common/Clock.h" // for ceph_clock_now()
+#include "common/debug.h"
 #include "common/Formatter.h"
 
 #define dout_context g_ceph_context

src/mgr/DaemonState.h

@@ -17,6 +17,7 @@
 #include <map>
 #include <string>
 #include <memory>
+#include <shared_mutex> // for std::shared_lock
 #include <set>
 #include <boost/circular_buffer.hpp>
 

src/mgr/MDSPerfMetricTypes.h

@@ -6,7 +6,7 @@
 
 #include <regex>
 #include <vector>
-#include <iostream>
+#include <iosfwd>
 
 #include "include/denc.h"
 #include "include/stringify.h"