]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #65509 from MaxKellermann/mon_includes
authorKefu Chai <k.chai@proxmox.com>
Wed, 18 Mar 2026 03:25:01 +0000 (11:25 +0800)
committerGitHub <noreply@github.com>
Wed, 18 Mar 2026 03:25:01 +0000 (11:25 +0800)
mon: reduce header dependencies

Reviewed-by: Kefu Chai <k.chai@proxmox.com>
38 files changed:
1  2 
src/CMakeLists.txt
src/crimson/CMakeLists.txt
src/mgr/Mgr.cc
src/mgr/MgrContext.h
src/mon/AuthMonitor.cc
src/mon/CommandHandler.h
src/mon/ConfigMonitor.cc
src/mon/ConnectionTracker.h
src/mon/ElectionLogic.cc
src/mon/ElectionLogic.h
src/mon/Elector.cc
src/mon/Elector.h
src/mon/FSCommands.cc
src/mon/FSCommands.h
src/mon/HealthMonitor.cc
src/mon/KVMonitor.cc
src/mon/LogMonitor.cc
src/mon/MDSMonitor.cc
src/mon/MDSMonitor.h
src/mon/MgrMap.h
src/mon/MgrMonitor.cc
src/mon/MgrStatMonitor.cc
src/mon/MgrStatMonitor.h
src/mon/MonCap.h
src/mon/MonOpRequest.h
src/mon/Monitor.cc
src/mon/Monitor.h
src/mon/MonitorDBStore.h
src/mon/MonmapMonitor.cc
src/mon/MonmapMonitor.h
src/mon/OSDMonitor.cc
src/mon/PGMap.cc
src/mon/PGMap.h
src/mon/Paxos.cc
src/mon/PaxosService.cc
src/mon/PaxosService.h
src/mon/mon_types.h
src/test/osd/TestOSDMap.cc

Simple merge
Simple merge
diff --cc src/mgr/Mgr.cc
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 8c82af4fb135233268f081d80d96b57a2dbd618f,913fad6e6108f0556e4835aac7453fd87d815e84..d714d237fe703534a199748a348840df14ced8bf
  #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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index e43bddac411423a3931157e0bd3f585b0dd7919f,90c0a27f889f90949fd0f5b5477fd6412367f641..86d7b261a2be1955d00209e4b426e6a0e1449c48
  #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"
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/mon/PGMap.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge