Merge pull request ceph#61608 from MaxKellermann/mon_includes

mon: include cleanup

Reviewed-by: Patrick Donnelly <[email protected]>

Author: MaxKellermann

src/krbd.cc

@@ -30,12 +30,14 @@
 #include <utility>
 
 #include "auth/KeyRing.h"
+#include "common/ceph_context.h"
 #include "common/errno.h"
 #include "common/Formatter.h"
 #include "common/module.h"
 #include "common/run_cmd.h"
 #include "common/safe_io.h"
 #include "common/secret.h"
+#include "common/strtol.h" // for strict_strtoll()
 #include "common/TextTable.h"
 #include "common/Thread.h"
 #include "include/ceph_assert.h"

src/mon/ConfigMap.cc

@@ -1,16 +1,18 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <boost/algorithm/string/split.hpp>
-
 #include "ConfigMap.h"
 #include "crush/CrushWrapper.h"
 #include "common/entity_name.h"
 
+#include <boost/algorithm/string/split.hpp>
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #include "common/dout.h"
 
+#include <iomanip>
+
 using namespace std::literals;
 
 using std::cerr;

src/mon/ConfigMap.h

@@ -3,11 +3,14 @@
 
 #pragma once
 
+#include <list>
 #include <map>
+#include <memory>
 #include <optional>
 #include <ostream>
 #include <string>
 
+#include "include/types.h" // for version_t
 #include "include/utime.h"
 #include "common/options.h"
 #include "common/entity_name.h"

src/mon/ConfigMonitor.cc

@@ -1,10 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <boost/algorithm/string/predicate.hpp>
-
-#include "mon/Monitor.h"
 #include "mon/ConfigMonitor.h"
+#include "mon/Monitor.h"
 #include "mon/KVMonitor.h"
 #include "mon/MgrMonitor.h"
 #include "mon/OSDMonitor.h"
@@ -15,6 +13,9 @@
 #include "common/TextTable.h"
 #include "common/cmdparse.h"
 #include "include/stringify.h"
+#include "crush/CrushWrapper.h"
+
+#include <boost/algorithm/string/predicate.hpp>
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

src/mon/ConfigMonitor.h

@@ -3,11 +3,13 @@
 
 #pragma once
 
-#include <optional>
-
 #include "ConfigMap.h"
 #include "mon/PaxosService.h"
 
+#include <map>
+#include <optional>
+#include <string>
+
 class MonSession;
 
 class ConfigMonitor : public PaxosService

src/mon/ElectionLogic.cc

@@ -17,6 +17,11 @@
 #include "include/ceph_assert.h"
 #include "common/dout.h"
 
+#include <iomanip>
+#include <ostream>
+#include <sstream>
+#include <string>
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, epoch, elector)

src/mon/ElectionLogic.h

@@ -17,6 +17,7 @@
 #define CEPH_ELECTIONLOGIC_H
 
 #include <map>
+#include <memory>
 #include <set>
 #include "include/types.h"
 #include "ConnectionTracker.h"

src/mon/FSCommands.cc

@@ -12,13 +12,14 @@
  * 
  */
 
-
-#include "OSDMonitor.h"
-
 #include "FSCommands.h"
+#include "OSDMonitor.h"
 #include "MDSMonitor.h"
 #include "MgrStatMonitor.h"
 #include "mds/cephfs_features.h"
+#include "mds/FSMap.h"
+#include "osd/OSDMap.h"
+#include "common/strtol.h" // for strict_strtoll()
 
 using TOPNSPC::common::cmd_getval;
 

src/mon/FSCommands.h

@@ -19,11 +19,14 @@
 #include "Monitor.h"
 #include "CommandHandler.h"
 
-#include "osd/OSDMap.h"
-#include "mds/FSMap.h"
-
+#include <iosfwd>
+#include <memory>
 #include <string>
-#include <ostream>
+#include <variant>
+
+class Filesystem;
+class FSMap;
+class OSDMap;
 
 class FileSystemCommandHandler : protected CommandHandler
 {

src/mon/MDSMonitor.cc

@@ -39,6 +39,7 @@
 #include "include/ceph_assert.h"
 #include "include/str_list.h"
 #include "include/stringify.h"
+#include "mds/cephfs_features.h"
 #include "mds/mdstypes.h"
 #include "Session.h"