mon: add missing includes

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

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index de6682bea66e4daf360057b9ee53d99c3b8a2634..e1475368d012a02dda04715441ceba92860818bb 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -24,6 +24,7 @@
 
 #include "common/config.h"
 #include "include/ceph_features.h"
+#include "include/util.h" // for ceph_data_stats_t
 
 #include "mon/MonMap.h"
 #include "mon/Monitor.h"
@@ -35,6 +36,7 @@
 #include "include/CompatSet.h"
 
 #include "common/ceph_argparse.h"
+#include "common/debug.h"
 #include "common/pick_address.h"
 #include "common/JSONFormatter.h"
 #include "common/Throttle.h"

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 804c0f12b3169b7344b59abd65027303ccaa278d..2a97db47657c856d59701288036ef9aa694cc47a 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -33,6 +33,7 @@
 
 #include "auth/AuthServiceHandler.h"
 #include "auth/KeyRing.h"
+#include "common/debug.h"
 #include "include/stringify.h"
 #include "include/ceph_assert.h"
 

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index 53f6c065f8aa76623a7507e025e27808e695e919..e377008240e67257946ed08ac99a28e0bee9096c 100644 (file)
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -11,6 +11,7 @@
 #include "messages/MConfig.h"
 #include "messages/MGetConfig.h"
 #include "messages/MMonCommand.h"
+#include "common/debug.h"
 #include "common/JSONFormatter.h"
 #include "common/TextTable.h"
 #include "common/cmdparse.h"

diff --git a/src/mon/ConfigMonitor.h b/src/mon/ConfigMonitor.h
index 8b3a67c80bd1b5b806811039c5891217b131262c..b1866333f2be38f867f6abf7895c6785d8c683ee 100644 (file)
--- a/src/mon/ConfigMonitor.h
+++ b/src/mon/ConfigMonitor.h
@@ -11,6 +11,7 @@
 #include <string>
 
 class MonSession;
+struct Subscription;
 
 class ConfigMonitor : public PaxosService
 {

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index adc4d36aef9121e05856fbd021943cd5ac2dc5af..33a972d4893330e415b730f41867a73145420347 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -16,6 +16,7 @@
 #include "Elector.h"
 #include "Monitor.h"
 
+#include "common/debug.h"
 #include "common/Timer.h"
 #include "include/Context.h"
 #include "MonitorDBStore.h"

diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc
index d714d237fe703534a199748a348840df14ced8bf..fee5c3d17d46aae9b89cfffae33755ef573728db 100644 (file)
--- a/src/mon/HealthMonitor.cc
+++ b/src/mon/HealthMonitor.cc
@@ -20,6 +20,8 @@
 #include <time.h>
 #include <iterator>
 
+#include "crush/CrushWrapper.h"
+
 #include "include/ceph_assert.h"
 #include "include/common_fwd.h"
 #include "include/stringify.h"
@@ -34,8 +36,10 @@
 #include "messages/MMonCommand.h"
 #include "messages/MMonHealthChecks.h"
 
+#include "common/debug.h"
 #include "common/Formatter.h"
 #include "common/prime.h"
+#include "crush/CrushWrapper.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/KVMonitor.cc b/src/mon/KVMonitor.cc
index 32d10355424e2a7454ec2853ee6831e38571f7af..3099cbf87f5bd8b10551f98b6d8e5bc9e4e147de 100644 (file)
--- a/src/mon/KVMonitor.cc
+++ b/src/mon/KVMonitor.cc
@@ -4,6 +4,7 @@
 #include "mon/Monitor.h"
 #include "mon/KVMonitor.h"
 #include "mon/Paxos.h"
+#include "common/debug.h"
 #include "include/stringify.h"
 #include "messages/MKVData.h"
 #include "messages/MMonCommand.h"

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index c9423b57a0b62df91f373c309eab698e7fb5d5bf..b584f20767c5c606666fc72d8f0eda00405cbc8a 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -59,6 +59,7 @@
 #include "common/Graylog.h"
 #include "common/Journald.h"
 #include "common/errno.h"
+#include "common/safe_io.h"
 #include "common/strtol.h"
 #include "include/ceph_assert.h"
 #include "include/str_list.h"

diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index a77acd2ecd3fbefc75a5552916474467069bac4b..d635dfa5d22b09fbe39e71ce66b4ba62c21b2671 100644 (file)
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -19,18 +19,23 @@
 #include <atomic>
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
 
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
-#include "include/types.h"
+#include "include/utime.h"
+#include "include/types.h" // for version_t
 #include "PaxosService.h"
 
 #include "common/config_fwd.h"
+#include "common/debug.h"
 #include "common/LogEntry.h"
 #include "include/str_map.h"
 
 class MLog;
+struct Subscription;
 
 static const std::string LOG_META_CHANNEL = "$channel";
 

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 3ba191fc42409f16b84384bc9e08b0acfe42e346..4e58e78f38730b40456053d46b3a0518e8233563 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -33,6 +33,8 @@
 #include "common/perf_counters.h"
 #include "common/config.h"
 #include "common/cmdparse.h"
+#include "common/debug.h"
+#include "common/errno.h"
 #include "messages/MMDSMap.h"
 #include "messages/MFSMap.h"
 #include "messages/MFSMapUser.h"
@@ -43,6 +45,7 @@
 #include "include/ceph_assert.h"
 #include "include/str_list.h"
 #include "include/stringify.h"
+#include "include/util.h" // for dump_services()
 #include "mds/cephfs_features.h"
 #include "mds/mdstypes.h"
 #include "mds/cephfs_features.h" // for CEPHFS_FEATURE_*

diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index 746cee2ee97e04e5b7e40318570e02d8117a8f53..e3b88127940a976466b9249a6b3551709af97aa2 100644 (file)
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -28,10 +28,12 @@
 #include "PaxosService.h"
 #include "mds/MDSMap.h"
 #include "messages/MMDSBeacon.h"
+#include "mon/mon_types.h" // for Metadata
 #include "CommandHandler.h"
 
 class Monitor;
 class FileSystemCommandHandler;
+struct Subscription;
 
 class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHandler {
  public:

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 5e85233a3d06e1c093e4fdd0ce7a14825982dcc3..ef98c383dd0dd8544f09f1857ed0935f3a385da3 100644 (file)
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -20,6 +20,7 @@
 #include "messages/MMonCommand.h"
 
 #include "include/stringify.h"
+#include "include/util.h" // for dump_services()
 #include "mgr/MgrContext.h"
 #include "mgr/mgr_commands.h"
 #include "OSDMonitor.h"
@@ -28,6 +29,8 @@
 #include "Monitor.h"
 #include "Paxos.h"
 
+#include "common/debug.h"
+#include "common/errno.h"
 #include "common/TextTable.h"
 #include "include/stringify.h"
 

diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index c03fdc74018be90464ccd28f527d672b6d55e205..7dee5c9f9a3b5785745e08a77d15ee4c31a115ab 100644 (file)
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -14,6 +14,7 @@
 #include "messages/MStatfsReply.h"
 #include "messages/MServiceMap.h"
 
+#include "common/debug.h"
 #include "include/ceph_assert.h"       // re-clobber assert
 
 #define dout_subsys ceph_subsys_mon

diff --git a/src/mon/MgrStatMonitor.h b/src/mon/MgrStatMonitor.h
index 14e818782f99b2f21fb0699b72a412e836e46c3b..acb3a9a1beaf5185bfb23bc68bc0eee2a8bb640f 100644 (file)
--- a/src/mon/MgrStatMonitor.h
+++ b/src/mon/MgrStatMonitor.h
@@ -9,6 +9,8 @@
 #include "mon/PGMap.h"
 #include "mgr/ServiceMap.h"
 
+struct Subscription;
+
  class MgrStatMonitor : public PaxosService, 
                         public md_config_obs_t {
   // live version

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 0bef5a92b44326efaaa25da8fc577abea9abecdf..86024f10b041d83a4cbd9e6adb346b5caa60dde6 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -52,6 +52,7 @@
 #include "MonClient.h"
 #include "error_code.h"
 #include "MonMap.h"
+#include "mon_types.h" // for ceph::features::mon::*
 
 #include "auth/Auth.h"
 #include "auth/KeyRing.h"

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 70228404c5cadd4f705fa16bbbd60ad59ec8b33f..a61162b9f542099d3a9f42c03147b617e7be6865 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -32,12 +32,14 @@
 #include <boost/asio/executor_work_guard.hpp>
 #include <boost/asio/post.hpp>
 
+#include "msg/Dispatcher.h"
 #include "msg/Messenger.h"
 
 #include "MonMap.h"
 #include "MonSub.h"
 
 #include "common/admin_socket.h"
+#include "common/debug.h"
 #include "common/strtol.h" // for strict_strtoll()
 #include "common/Timer.h"
 #include "common/config.h"

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c4a5d7211aa7816bec88a8e43223f4eb9fea864d..80bca9ca4b9a390f8c73fc12ce857aa1a3a48eec 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -83,6 +83,7 @@
 #include "include/color.h"
 #include "include/ceph_fs.h"
 #include "include/str_list.h"
+#include "include/util.h" // for collect_sys_info(), dump_services()
 
 #include "OSDMonitor.h"
 #include "MDSMonitor.h"

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 5236ebf899ee6894d76f00e85e02a9dace9fb552..cc7d7b12e0278dd6ee27da1064bd123b0fb0dbe5 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -47,7 +47,9 @@
 #include "auth/AuthMethodList.h"
 #include "auth/KeyRing.h"
 #include "include/common_fwd.h"
+#include "include/CompatSet.h"
 #include "mon/MonitorDBStore.h"
+#include "mon/mon_types.h" // for Metadata, PAXOS_*, ScrubResult
 #include "mgr/MgrClient.h"
 #include <boost/smart_ptr/atomic_shared_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>

diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h
index 86d7b261a2be1955d00209e4b426e6a0e1449c48..a645bb7e4ae7b1a43be0e86542419dcfc1f92069 100644 (file)
--- a/src/mon/MonitorDBStore.h
+++ b/src/mon/MonitorDBStore.h
@@ -14,8 +14,6 @@
 #ifndef CEPH_MONITOR_DB_STORE_H
 #define CEPH_MONITOR_DB_STORE_H
 
-#include "include/types.h"
-#include "include/buffer.h"
 #include <set>
 #include <map>
 #include <string>
@@ -24,7 +22,10 @@
 #include <fstream>
 #include "kv/KeyValueDB.h"
 
+#include "include/buffer.h"
 #include "include/ceph_assert.h"
+#include "include/Context.h"
+#include "include/types.h" // for version_t
 #include "common/JSONFormatter.h"
 #include "common/Finisher.h"
 #include "common/errno.h"

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 3ea24d263edca81fbd80ffdb450a9b9769b00779..23e72f32e7b5eec1ded09846b7ce82dc12c8a6f6 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -21,6 +21,7 @@
 #include "messages/MMonJoin.h"
 
 #include "common/ceph_argparse.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include <sstream>
 #include "common/config.h"

diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
index 3b998d7d3052a6b6248f9f23e42089d731cdc426..612b967b65ac874194218296efb469bb3da7848d 100644 (file)
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@ -30,6 +30,8 @@
 #include "MonMap.h"
 #include "MonitorDBStore.h"
 
+struct Subscription;
+
 class MonmapMonitor : public PaxosService {
  public:
   MonmapMonitor(Monitor &mn, Paxos &p, const std::string& service_name)

diff --git a/src/mon/NVMeofGwMap.h b/src/mon/NVMeofGwMap.h
index 60d44796f25245afee0b629eea33fa6405f16217..e5fa568d722b8a61274418e61318169922881c93 100644 (file)
--- a/src/mon/NVMeofGwMap.h
+++ b/src/mon/NVMeofGwMap.h
@@ -18,6 +18,7 @@
 #include <iostream>
 #include "include/encoding.h"
 #include "include/utime.h"
+#include "common/debug.h"
 #include "common/Formatter.h"
 #include "common/ceph_releases.h"
 #include "common/version.h"

diff --git a/src/mon/NVMeofGwMon.cc b/src/mon/NVMeofGwMon.cc
index 5cd9089caba5a25d34321c815c1fe9bb649f229f..fe8bf32318b3baf19dc50584deb3383d9ae0fe8e 100644 (file)
--- a/src/mon/NVMeofGwMon.cc
+++ b/src/mon/NVMeofGwMon.cc
@@ -16,6 +16,7 @@
 #include "include/stringify.h"
 #include "NVMeofGwMon.h"
 #include "Monitor.h"
+#include "common/errno.h"
 #include "messages/MMonCommand.h"
 #include "messages/MNVMeofGwBeacon.h"
 #include "messages/MNVMeofGwMap.h"

diff --git a/src/mon/NVMeofGwMon.h b/src/mon/NVMeofGwMon.h
index 1e92609324cdbfe5803c30a6a50cac6255e866cf..17f92ab2bfeea0dd9461614d2bbf0813d1dcb1fd 100644 (file)
--- a/src/mon/NVMeofGwMon.h
+++ b/src/mon/NVMeofGwMon.h
@@ -18,6 +18,8 @@
 #include "PaxosService.h"
 #include "NVMeofGwMap.h"
 
+struct Subscription;
+
 struct LastBeacon {
   NvmeGwId gw_id;
   NvmeGroupKey group_key;

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c47637bf0f4d31c8ab0adb1582b942564e0f9204..856fce6ff18a190809d2045970c5f6b14e661bd0 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -74,6 +74,7 @@
 #include "common/prime.h"
 
 #include "common/config.h"
+#include "common/debug.h"
 #include "common/errno.h"
 
 #include "erasure-code/ErasureCodePlugin.h"

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 2f4e832db738cdb63faf6e0bd95015e70e349776..b37681067fa2babc324236ef0649b297f51a9e57 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -46,7 +46,7 @@ class Monitor;
 class PGMap;
 struct MonSession;
 class MOSDMap;
-
+struct Subscription;
 
 /// information about a particular peer's failure reports for one osd
 struct failure_reporter_t {

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index e57cb4a534aaf6b52f7832dbed76ed48a8d5c6d1..a6c2c7ef5c178d921de6283fbd7fd8d4ba4e631a 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -20,6 +20,8 @@
 #include "osd/osd_types.h"
 #include "osd/OSDMap.h"
 
+#include "crush/CrushWrapper.h"
+
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 

diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index 1471ee5992f6275be582164d58c5234346649697..9906116146b72d3b209333b69baf5a8e19f80061 100644 (file)
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -24,19 +24,18 @@
 
 #include "include/buffer.h"
 #include "include/ceph_fs.h" // for ceph_statfs
-#include "common/debug.h" // for cmdmap_t
-#include "common/cmdparse.h"
+#include "common/cmdparse.h" // for cmdmap_t
 #include "common/Formatter.h"
 #include "osd/osd_types.h"
 #include "include/mempool.h"
-#include "mon/health_check.h"
-#include <sstream>
 #include "mon/mon_types.h"
 
 #include <cstdint>
 #include <iosfwd>
 #include <map>
+#include <optional>
 #include <set>
+#include <sstream>
 #include <string>
 
 struct health_check_map_t;

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 5af6c93228b434838bcfce7f4b7683980c2040e1..5d547a9c9ac88e53809afb5a1c42fce6d183dbcd 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -20,6 +20,7 @@
 
 #include "mon/mon_types.h"
 #include "common/config.h"
+#include "common/debug.h"
 #include "include/ceph_assert.h"
 #include "include/stringify.h"
 #include "common/Timer.h"

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 5a9033a58ac352dae82e627cb5192878fcab2fce..b4c39cc11d56aa14143f500e32a50e5bba3e581c 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -17,6 +17,7 @@
 #include "Paxos.h"
 #include "common/Clock.h"
 #include "common/config.h"
+#include "common/debug.h"
 #include "include/stringify.h"
 #include "include/ceph_assert.h"
 #include "messages/PaxosServiceMessage.h"