Merge pull request #65509 from MaxKellermann/mon_includes

mon: reduce header dependencies

Reviewed-by: Kefu Chai <k.chai@proxmox.com>

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/crimson/CMakeLists.txt
Simple merge

diff --cc src/mgr/Mgr.cc
Simple merge

diff --cc src/mgr/MgrContext.h
Simple merge

diff --cc src/mon/AuthMonitor.cc
Simple merge

diff --cc src/mon/CommandHandler.h
Simple merge

diff --cc src/mon/ConfigMonitor.cc
Simple merge

diff --cc src/mon/ConnectionTracker.h
Simple merge

diff --cc src/mon/ElectionLogic.cc
Simple merge

diff --cc src/mon/ElectionLogic.h
Simple merge

diff --cc src/mon/Elector.cc
Simple merge

diff --cc src/mon/Elector.h
Simple merge

diff --cc src/mon/FSCommands.cc
Simple merge

diff --cc src/mon/FSCommands.h
Simple merge

diff --cc src/mon/HealthMonitor.cc
index 8c82af4fb135233268f081d80d96b57a2dbd618f,913fad6e6108f0556e4835aac7453fd87d815e84..d714d237fe703534a199748a348840df14ced8bf
--- 1/src/mon/HealthMonitor.cc
--- 2/src/mon/HealthMonitor.cc
+++ b/src/mon/HealthMonitor.cc
@@@ -25,10 -24,9 +25,11 @@@
  #include "include/stringify.h"
  
  #include "mon/Monitor.h"
+ #include "mon/MonMap.h"
  #include "mon/HealthMonitor.h"
  #include "mon/OSDMonitor.h"
 +#include "osd/OSDMap.h"
 +
  
  #include "messages/MMonCommand.h"
  #include "messages/MMonHealthChecks.h"

diff --cc src/mon/KVMonitor.cc
Simple merge

diff --cc src/mon/LogMonitor.cc
Simple merge

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/mon/MDSMonitor.h
Simple merge

diff --cc src/mon/MgrMap.h
Simple merge

diff --cc src/mon/MgrMonitor.cc
Simple merge

diff --cc src/mon/MgrStatMonitor.cc
Simple merge

diff --cc src/mon/MgrStatMonitor.h
Simple merge

diff --cc src/mon/MonCap.h
Simple merge

diff --cc src/mon/MonOpRequest.h
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/Monitor.h
Simple merge

diff --cc src/mon/MonitorDBStore.h
index e43bddac411423a3931157e0bd3f585b0dd7919f,90c0a27f889f90949fd0f5b5477fd6412367f641..86d7b261a2be1955d00209e4b426e6a0e1449c48
--- 1/src/mon/MonitorDBStore.h
--- 2/src/mon/MonitorDBStore.h
+++ b/src/mon/MonitorDBStore.h
@@@ -25,9 -24,10 +25,10 @@@
  #include "kv/KeyValueDB.h"
  
  #include "include/ceph_assert.h"
 -#include "common/Formatter.h"
 +#include "common/JSONFormatter.h"
  #include "common/Finisher.h"
  #include "common/errno.h"
+ #include "common/Clock.h"
  #include "common/debug.h"
  #include "common/safe_io.h"
  #include "common/blkdev.h"

diff --cc src/mon/MonmapMonitor.cc
Simple merge

diff --cc src/mon/MonmapMonitor.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/mon/PGMap.cc
Simple merge

diff --cc src/mon/PGMap.h
Simple merge

diff --cc src/mon/Paxos.cc
Simple merge

diff --cc src/mon/PaxosService.cc
Simple merge

diff --cc src/mon/PaxosService.h
Simple merge

diff --cc src/mon/mon_types.h
Simple merge

diff --cc src/test/osd/TestOSDMap.cc
Simple merge