From ddc7b1a599585249d36b7817571e4bf48f42dcbe Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 28 Apr 2025 09:40:43 +0200 Subject: [PATCH] mon: add missing includes Signed-off-by: Max Kellermann --- src/mon/AuthMonitor.h | 1 + src/mon/ConnectionTracker.h | 8 ++++++++ src/mon/Elector.cc | 1 + src/mon/FSCommands.cc | 2 ++ src/mon/FSCommands.h | 2 ++ src/mon/HealthMonitor.cc | 1 + src/mon/HealthMonitor.h | 4 ++++ src/mon/KVMonitor.cc | 1 + src/mon/LogMonitor.cc | 1 + src/mon/MDSMonitor.h | 2 ++ src/mon/MgrMonitor.cc | 2 ++ src/mon/MgrStatMonitor.cc | 1 + src/mon/MonCap.h | 4 ++++ src/mon/MonMap.h | 1 + src/mon/MonSub.h | 1 + src/mon/MonmapMonitor.h | 4 +++- src/mon/NVMeofGwMap.cc | 1 + src/mon/NVMeofGwMon.cc | 2 ++ src/mon/PGMap.h | 1 + src/mon/PaxosFSMap.h | 1 + src/mon/PaxosService.cc | 1 + 21 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h index c8860cf299b..8b42e1ba560 100644 --- a/src/mon/AuthMonitor.h +++ b/src/mon/AuthMonitor.h @@ -18,6 +18,7 @@ #include #include +#include "auth/cephx/CephxKeyServer.h" #include "global/global_init.h" #include "include/ceph_features.h" #include "include/types.h" diff --git a/src/mon/ConnectionTracker.h b/src/mon/ConnectionTracker.h index 8f811c2a628..61b4ac03da0 100644 --- a/src/mon/ConnectionTracker.h +++ b/src/mon/ConnectionTracker.h @@ -13,8 +13,16 @@ */ #pragma once + +#include "include/encoding.h" #include "include/types.h" +#include +#include +#include + +namespace ceph { class Formatter; } + struct ConnectionReport { int rank = -1; // mon rank this state belongs to std::map current; // true if connected to the other mon diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index f40cf887def..3e71a69426e 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -19,6 +19,7 @@ #include "MonitorDBStore.h" #include "messages/MMonElection.h" #include "messages/MMonPing.h" +#include "msg/Messenger.h" #include "common/config.h" #include "include/ceph_assert.h" diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc index 4cb50d71fc3..ea63e86fa65 100644 --- a/src/mon/FSCommands.cc +++ b/src/mon/FSCommands.cc @@ -21,6 +21,8 @@ #include "osd/OSDMap.h" #include "common/strtol.h" // for strict_strtoll() +#include + using TOPNSPC::common::cmd_getval; using std::list; diff --git a/src/mon/FSCommands.h b/src/mon/FSCommands.h index d44a252b97f..890e5a90e54 100644 --- a/src/mon/FSCommands.h +++ b/src/mon/FSCommands.h @@ -19,6 +19,8 @@ #include "Monitor.h" #include "CommandHandler.h" +#include "include/cephfs/types.h" // for fs_cluster_id_t" + #include #include #include diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc index 117e4e050e5..ec98ff795ec 100644 --- a/src/mon/HealthMonitor.cc +++ b/src/mon/HealthMonitor.cc @@ -27,6 +27,7 @@ #include "mon/HealthMonitor.h" #include "mon/OSDMonitor.h" +#include "messages/MMonCommand.h" #include "messages/MMonHealthChecks.h" #include "common/Formatter.h" diff --git a/src/mon/HealthMonitor.h b/src/mon/HealthMonitor.h index b0315d6afbc..27651232340 100644 --- a/src/mon/HealthMonitor.h +++ b/src/mon/HealthMonitor.h @@ -14,6 +14,10 @@ #ifndef CEPH_HEALTH_MONITOR_H #define CEPH_HEALTH_MONITOR_H +#include +#include +#include + #include "mon/PaxosService.h" class HealthMonitor : public PaxosService diff --git a/src/mon/KVMonitor.cc b/src/mon/KVMonitor.cc index 21a18db09f5..4cb4f5c0151 100644 --- a/src/mon/KVMonitor.cc +++ b/src/mon/KVMonitor.cc @@ -5,6 +5,7 @@ #include "mon/KVMonitor.h" #include "include/stringify.h" #include "messages/MKVData.h" +#include "messages/MMonCommand.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 3cd9c40e524..82ddf9a899a 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -53,6 +53,7 @@ #include "messages/MMonCommand.h" #include "messages/MLog.h" #include "messages/MLogAck.h" +#include "msg/Messenger.h" #include "common/Graylog.h" #include "common/Journald.h" #include "common/errno.h" diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h index 567a11bce9d..f67c5447ecf 100644 --- a/src/mon/MDSMonitor.h +++ b/src/mon/MDSMonitor.h @@ -23,8 +23,10 @@ #include #include "include/types.h" +#include "Monitor.h" #include "PaxosFSMap.h" #include "PaxosService.h" +#include "mds/MDSMap.h" #include "msg/Messenger.h" #include "messages/MMDSBeacon.h" #include "CommandHandler.h" diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 4c762dd4999..fc7f9e9546f 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -16,6 +16,7 @@ #include "messages/MMgrBeacon.h" #include "messages/MMgrMap.h" #include "messages/MMgrDigest.h" +#include "messages/MMonCommand.h" #include "include/stringify.h" #include "mgr/MgrContext.h" @@ -23,6 +24,7 @@ #include "OSDMonitor.h" #include "ConfigMonitor.h" #include "HealthMonitor.h" +#include "Monitor.h" #include "common/TextTable.h" #include "include/stringify.h" diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc index 9bcee5b77d0..b98fa6e1e4b 100644 --- a/src/mon/MgrStatMonitor.cc +++ b/src/mon/MgrStatMonitor.cc @@ -4,6 +4,7 @@ #include "MgrStatMonitor.h" #include "mon/OSDMonitor.h" #include "mon/MgrMonitor.h" +#include "mon/Monitor.h" #include "mon/PGMap.h" #include "messages/MGetPoolStats.h" #include "messages/MGetPoolStatsReply.h" diff --git a/src/mon/MonCap.h b/src/mon/MonCap.h index a7a3692790a..11c509f0e4d 100644 --- a/src/mon/MonCap.h +++ b/src/mon/MonCap.h @@ -4,12 +4,16 @@ #ifndef CEPH_MONCAP_H #define CEPH_MONCAP_H +#include #include +#include +#include #include "include/common_fwd.h" #include "include/types.h" #include "common/entity_name.h" #include "mds/mdstypes.h" +#include "msg/msg_types.h" // for entity_addr_t static const __u8 MON_CAP_R = (1 << 1); // read static const __u8 MON_CAP_W = (1 << 2); // write diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 158792c9e2b..7b7e649d366 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -21,6 +21,7 @@ #include "common/config_fwd.h" #include "common/ceph_releases.h" +#include "include/types.h" // for epoch_t #include "include/uuid.h" // for uuid_d #include "mon/mon_types.h" // for mon_feature_t diff --git a/src/mon/MonSub.h b/src/mon/MonSub.h index 8ff5a8f1872..1f50d024416 100644 --- a/src/mon/MonSub.h +++ b/src/mon/MonSub.h @@ -7,6 +7,7 @@ #include #include "common/ceph_time.h" +#include "include/ceph_fs.h" // for ceph_mon_subscribe_item #include "include/types.h" // mon subscriptions diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h index dc75e9620b2..7c196404c2b 100644 --- a/src/mon/MonmapMonitor.h +++ b/src/mon/MonmapMonitor.h @@ -19,9 +19,11 @@ #ifndef CEPH_MONMAPMONITOR_H #define CEPH_MONMAPMONITOR_H -#include +#include #include +#include +#include "include/buffer_fwd.h" #include "include/types.h" #include "msg/Messenger.h" diff --git a/src/mon/NVMeofGwMap.cc b/src/mon/NVMeofGwMap.cc index 4b3fb2c676b..a1aee05d9cc 100755 --- a/src/mon/NVMeofGwMap.cc +++ b/src/mon/NVMeofGwMap.cc @@ -15,6 +15,7 @@ #include "include/stringify.h" #include "NVMeofGwMon.h" #include "NVMeofGwMap.h" +#include "Monitor.h" #include "OSDMonitor.h" #include "mon/health_check.h" diff --git a/src/mon/NVMeofGwMon.cc b/src/mon/NVMeofGwMon.cc index 3a18c4195c0..466d334edb6 100644 --- a/src/mon/NVMeofGwMon.cc +++ b/src/mon/NVMeofGwMon.cc @@ -14,6 +14,8 @@ #include #include "include/stringify.h" #include "NVMeofGwMon.h" +#include "Monitor.h" +#include "messages/MMonCommand.h" #include "messages/MNVMeofGwBeacon.h" #include "messages/MNVMeofGwMap.h" diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h index 2ce76be8553..44eba77f6ce 100644 --- a/src/mon/PGMap.h +++ b/src/mon/PGMap.h @@ -22,6 +22,7 @@ #define CEPH_PGMAP_H #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/Formatter.h" diff --git a/src/mon/PaxosFSMap.h b/src/mon/PaxosFSMap.h index 4312d7e1f4d..3b0181cf858 100644 --- a/src/mon/PaxosFSMap.h +++ b/src/mon/PaxosFSMap.h @@ -16,6 +16,7 @@ #define CEPH_PAXOS_FSMAP_H #include +#include #include "mds/FSMap.h" #include "mds/MDSMap.h" diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index 315539b93d0..2f7d8c38218 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -17,6 +17,7 @@ #include "common/config.h" #include "include/stringify.h" #include "include/ceph_assert.h" +#include "messages/PaxosServiceMessage.h" #include "mon/MonOpRequest.h" using std::ostream; -- 2.39.5