MON: optimize header file dependency.

same work as PR: https://github.com/ceph/ceph/pull/9161

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 10003a10afe177c2f7755223d136232369e7fee0..9bfc81434f8041e0d9c7094251a39ca04fe722b6 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -22,18 +22,11 @@
 #include "messages/MAuth.h"
 #include "messages/MAuthReply.h"
 #include "messages/MMonGlobalID.h"
-
-#include "common/Timer.h"
-#include "common/config.h"
-#include "common/cmdparse.h"
+#include "msg/Messenger.h"
 
 #include "auth/AuthServiceHandler.h"
 #include "auth/KeyRing.h"
-
-#include "osd/osd_types.h"
-
 #include "include/assert.h"
-#include "include/str_list.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
index 442029027183bca7653af7cfff2aeadf5962977c..f40b5dc468022246e7b3c83d9ee53cb8ea535043 100644 (file)
--- a/src/mon/AuthMonitor.h
+++ b/src/mon/AuthMonitor.h
@@ -21,9 +21,7 @@ using namespace std;
 
 #include "include/ceph_features.h"
 #include "include/types.h"
-#include "msg/Messenger.h"
 #include "mon/PaxosService.h"
-#include "mon/Monitor.h"
 #include "mon/MonitorDBStore.h"
 
 class MMonCommand;
@@ -31,6 +29,7 @@ struct MAuth;
 class MAuthMon;
 struct MMonGlobalID;
 class KeyRing;
+class Monitor;
 
 #define MIN_GLOBAL_ID 0x1000
 

diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc
index 59798f2bbc5068208e44cf08773ee822ca19c34f..f88d4b60aa9b66dfb1ea9f364c267baf01b3ab42 100644 (file)
--- a/src/mon/ConfigKeyService.cc
+++ b/src/mon/ConfigKeyService.cc
@@ -17,12 +17,8 @@
 #include <limits.h>
 
 #include "mon/Monitor.h"
-#include "mon/QuorumService.h"
 #include "mon/ConfigKeyService.h"
 #include "mon/MonitorDBStore.h"
-
-#include "common/config.h"
-#include "common/cmdparse.h"
 #include "common/errno.h"
 
 #define dout_subsys ceph_subsys_mon

diff --git a/src/mon/ConfigKeyService.h b/src/mon/ConfigKeyService.h
index fe1d54d5ea57ac4de213bc9d786d76e923165b94..e03b92e27db7e3dc6a4d20cbac2e5bd3045634df 100644 (file)
--- a/src/mon/ConfigKeyService.h
+++ b/src/mon/ConfigKeyService.h
@@ -14,15 +14,13 @@
 #ifndef CEPH_MON_CONFIG_KEY_SERVICE_H
 #define CEPH_MON_CONFIG_KEY_SERVICE_H
 
-#include "mon/Monitor.h"
 #include "mon/QuorumService.h"
 
-#include "messages/MMonHealth.h"
-
-#include "common/config.h"
-#include "common/Formatter.h"
-
 class Paxos;
+class Monitor;
+namespace ceph {
+class Formatter;
+}
 
 class ConfigKeyService : public QuorumService
 {

diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc
index 3056a5edc8f3cd29ad0db775f63266a12eb58097..521adfdb0263bcd382e43bd44a5b1f1851820683 100644 (file)
--- a/src/mon/DataHealthService.cc
+++ b/src/mon/DataHealthService.cc
@@ -11,7 +11,6 @@
  * Foundation.  See file COPYING.
  *
  */
-#include <memory>
 #include "include/memory.h"
 #include <errno.h>
 #include <map>
@@ -34,14 +33,11 @@
 #endif
 
 #include "messages/MMonHealth.h"
-#include "include/types.h"
-#include "include/Context.h"
 #include "include/assert.h"
 #include "common/Formatter.h"
 #include "common/errno.h"
 
 #include "mon/Monitor.h"
-#include "mon/QuorumService.h"
 #include "mon/DataHealthService.h"
 
 #define dout_subsys ceph_subsys_mon

diff --git a/src/mon/DataHealthService.h b/src/mon/DataHealthService.h
index a986d18fe989ada2e181a48ca7aceb8ea10c68c3..a11ef82a77a10b25f3cae8c0d4d1cdc10180a71a 100644 (file)
--- a/src/mon/DataHealthService.h
+++ b/src/mon/DataHealthService.h
@@ -17,15 +17,14 @@
 #include <errno.h>
 
 #include "include/types.h"
-#include "include/Context.h"
 #include "mon/mon_types.h"
-#include "mon/QuorumService.h"
 #include "mon/HealthService.h"
-#include "common/Formatter.h"
 #include "common/config.h"
 #include "global/signal_handler.h"
 
 struct MMonHealth;
+namespace ceph { class Formatter; }
+
 
 class DataHealthService :
   public HealthService

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 2ad1161e73bad9e3c002304ec1a6e75c33a570cc..99049a3e93151868ff527ba9bdfd1cbb67e59c3b 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -17,7 +17,6 @@
 
 #include "common/Timer.h"
 #include "MonitorDBStore.h"
-#include "MonmapMonitor.h"
 #include "messages/MMonElection.h"
 
 #include "common/config.h"

diff --git a/src/mon/Elector.h b/src/mon/Elector.h
index 03a9d17d9b27081b4538bceaf1f29a20db2a06d6..1c2157eb331c323a8d24f88ff0e9e3e001aefc69 100644 (file)
--- a/src/mon/Elector.h
+++ b/src/mon/Elector.h
@@ -20,11 +20,7 @@
 using namespace std;
 
 #include "include/types.h"
-#include "msg/Message.h"
-
 #include "include/Context.h"
-
-#include "common/Timer.h"
 #include "mon/MonOpRequest.h"
 
 class Monitor;

diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc
index 24ac84c850fa9bf24fa09af3efcb59539936a3e4..bfa4ca02bb3826bdda6619ccddc9eb60bdf4f9af 100644 (file)
--- a/src/mon/HealthMonitor.cc
+++ b/src/mon/HealthMonitor.cc
@@ -16,19 +16,19 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include <boost/intrusive_ptr.hpp>
+// #include <boost/intrusive_ptr.hpp>
 // Because intusive_ptr clobbers our assert...
 #include "include/assert.h"
 
 #include "mon/Monitor.h"
-#include "mon/QuorumService.h"
-#include "mon/HealthService.h"
+// #include "mon/QuorumService.h"
+// #include "mon/HealthService.h"
 #include "mon/HealthMonitor.h"
 #include "mon/DataHealthService.h"
 
 #include "messages/MMonHealth.h"
-
-#include "common/config.h"
+#include "common/Formatter.h"
+// #include "common/config.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/HealthMonitor.h b/src/mon/HealthMonitor.h
index 43898762f064f928491765320a5c7b32833da222..215ed0436cab21d32106232d54a43f8dc4bcba7d 100644 (file)
--- a/src/mon/HealthMonitor.h
+++ b/src/mon/HealthMonitor.h
@@ -14,14 +14,11 @@
 #ifndef CEPH_HEALTH_MONITOR_H
 #define CEPH_HEALTH_MONITOR_H
 
-#include "mon/Monitor.h"
 #include "mon/QuorumService.h"
 #include "mon/HealthService.h"
 
-#include "messages/MMonHealth.h"
-
-#include "common/config.h"
-#include "common/Formatter.h"
+//forward declaration
+namespace ceph { class Formatter; }
 
 class HealthMonitor : public QuorumService
 {

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index 391a3380b79ba8d89233336aa16b2bbd996a0323..65d3db667248d3af593e1283f5a32880af8bb5bb 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -24,13 +24,8 @@
 #include "messages/MMonCommand.h"
 #include "messages/MLog.h"
 #include "messages/MLogAck.h"
-
-#include "common/Timer.h"
 #include "common/Graylog.h"
-
-#include "osd/osd_types.h"
 #include "common/errno.h"
-#include "common/config.h"
 #include "common/strtol.h"
 #include "include/assert.h"
 #include "include/str_list.h"

diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index 678c5ff3fc9ddc2e69c5aac710b5db883731e36e..99daff69acb4b0b48fa53a94e112066f19e10701 100644 (file)
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -20,13 +20,13 @@
 using namespace std;
 
 #include "include/types.h"
-#include "msg/Messenger.h"
 #include "PaxosService.h"
 
 #include "common/LogEntry.h"
-#include "messages/MLog.h"
+#include "include/str_map.h"
 
 class MMonCommand;
+class MLog;
 
 static const string LOG_META_CHANNEL = "$channel";
 

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 9d72a0f9ad618c741b3dd8247436c023b8bd86a1..504e3fb72b0900f52a189ad6bb5327a0a40d3ca6 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -21,23 +21,20 @@
 #include "OSDMonitor.h"
 
 #include "common/strtol.h"
-#include "common/ceph_argparse.h"
 #include "common/perf_counters.h"
-#include "common/Timer.h"
 #include "common/config.h"
 #include "common/cmdparse.h"
-
 #include "messages/MMDSMap.h"
 #include "messages/MFSMap.h"
-#include "messages/MMDSBeacon.h"
 #include "messages/MMDSLoadTargets.h"
 #include "messages/MMonCommand.h"
 #include "messages/MGenericMessage.h"
 
 #include "include/assert.h"
 #include "include/str_list.h"
-
+#include "include/stringify.h"
 #include "mds/mdstypes.h"
+#include "Session.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index 419deaa19d72e6b6fe37f4557382f78db9e4159e..2c70aff24fda7c925f05f1abfd97871b7fb6d992 100644 (file)
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -23,13 +23,10 @@
 using namespace std;
 
 #include "include/types.h"
-#include "msg/Messenger.h"
-
 #include "mds/FSMap.h"
-
+#include "mds/MDSMap.h"
 #include "PaxosService.h"
-#include "Session.h"
-
+#include "msg/Messenger.h"
 #include "messages/MMDSBeacon.h"
 
 class MMonCommand;

diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc
index a2540b56411c304c0bd22fffd6a1372ca2a2b9c3..55f7bebe8f65fa8573b5bd9f21b300ad93ffdb11 100644 (file)
--- a/src/mon/MonCap.cc
+++ b/src/mon/MonCap.cc
@@ -22,7 +22,6 @@
 
 #include "MonCap.h"
 #include "include/stringify.h"
-#include "common/config.h"
 #include "common/debug.h"
 #include "common/Formatter.h"
 

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index f906406f33ddaa32666c0cd2c5c8e7764fbb6add..6ae7b45740657e95a78b8030d0a9a504bfe702d6 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -12,7 +12,6 @@
  * 
  */
 
-#include "msg/Messenger.h"
 #include "messages/MMonGetMap.h"
 #include "messages/MMonGetVersion.h"
 #include "messages/MMonGetVersionReply.h"
@@ -26,8 +25,6 @@
 
 #include "messages/MMonSubscribe.h"
 #include "messages/MMonSubscribeAck.h"
-#include "common/ConfUtils.h"
-#include "common/ceph_argparse.h"
 #include "common/errno.h"
 #include "common/LogClient.h"
 
@@ -37,11 +34,7 @@
 #include "auth/Auth.h"
 #include "auth/KeyRing.h"
 #include "auth/AuthMethodList.h"
-
-#include "include/str_list.h"
-#include "include/addr_parsing.h"
-
-#include "common/config.h"
+#include "auth/RotatingKeyRing.h"
 
 
 #define dout_subsys ceph_subsys_monc

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 2efa1ff48facc2d9171da5113032e1693c78f67d..4e08ceb6d6c0aca5384aec27cf9189af8e1f3034 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -15,25 +15,18 @@
 #ifndef CEPH_MONCLIENT_H
 #define CEPH_MONCLIENT_H
 
-#include "msg/Dispatcher.h"
 #include "msg/Messenger.h"
 
 #include "MonMap.h"
 
 #include "common/Timer.h"
 #include "common/Finisher.h"
-
+#include "common/config.h"
 #include "auth/AuthClientHandler.h"
 #include "auth/RotatingKeyRing.h"
-
-#include "messages/MMonSubscribe.h"
-
 #include "common/SimpleRNG.h"
-#include "osd/osd_types.h"
 
-#include <memory>
 
-class MonMap;
 class MMonMap;
 class MMonGetVersion;
 class MMonGetVersionReply;
@@ -47,7 +40,9 @@ class LogClient;
 class AuthSupported;
 class AuthAuthorizeHandlerRegistry;
 class AuthMethodList;
-
+class Messenger;
+// class RotatingKeyRing;
+class KeyRing;
 enum MonClientState {
   MC_STATE_NONE,
   MC_STATE_NEGOTIATING,

diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index 390d88a7ca2e15a1a5aad911fda166b95a23070b..68597f3328cbcdb3413077efdad61427a5851247 100644 (file)
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@ -19,7 +19,6 @@
 
 #include "msg/Message.h"
 #include "include/types.h"
-//#include "common/config.h"
 
 namespace ceph {
   class Formatter;

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 719d5aae14d6a44e3c49f5d4f6b0ec6cecc57250..5800e603037c1ab61a006857e63bf95aee3fbfa3 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -27,8 +27,6 @@
 
 #include "MonitorDBStore.h"
 
-#include "msg/Messenger.h"
-
 #include "messages/PaxosServiceMessage.h"
 #include "messages/MMonMap.h"
 #include "messages/MMonGetMap.h"
@@ -62,13 +60,12 @@
 #include "common/errno.h"
 #include "common/perf_counters.h"
 #include "common/admin_socket.h"
-
 #include "global/signal_handler.h"
-
+#include "common/Formatter.h"
+#include "include/stringify.h"
 #include "include/color.h"
 #include "include/ceph_fs.h"
 #include "include/str_list.h"
-#include "include/str_map.h"
 
 #include "OSDMonitor.h"
 #include "MDSMonitor.h"
@@ -79,14 +76,11 @@
 #include "mon/QuorumService.h"
 #include "mon/HealthMonitor.h"
 #include "mon/ConfigKeyService.h"
-
-#include "auth/AuthMethodList.h"
-#include "auth/KeyRing.h"
-
 #include "common/config.h"
 #include "common/cmdparse.h"
 #include "include/assert.h"
 #include "include/compat.h"
+#include "perfglue/heap_profiler.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index add1c3ed676096ee52c9c49b0d1c51cb429ef693..d3d0a6b45be44fdee299ada231a5c26391aae7a1 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -33,29 +33,16 @@
 #include "Paxos.h"
 #include "Session.h"
 
-#include "osd/OSDMap.h"
-
 #include "common/LogClient.h"
-#include "common/SimpleRNG.h"
-#include "common/cmdparse.h"
-
 #include "auth/cephx/CephxKeyServer.h"
 #include "auth/AuthMethodList.h"
 #include "auth/KeyRing.h"
-
-#include "perfglue/heap_profiler.h"
-
 #include "messages/MMonCommand.h"
-#include "messages/MPing.h"
 #include "mon/MonitorDBStore.h"
-
-#include <memory>
 #include "include/memory.h"
-#include "include/str_map.h"
 #include <errno.h>
 #include <cmath>
 
-#include "common/TrackedOp.h"
 #include "mon/MonOpRequest.h"
 
 

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 1ff6e06b88bddcaff4193147449b96e103903c58..3cd61a26ec51743cc372636101b57eab3902a641 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -14,23 +14,17 @@
 
 #include "MonmapMonitor.h"
 #include "Monitor.h"
-#include "MonitorDBStore.h"
-
 #include "messages/MMonCommand.h"
 #include "messages/MMonJoin.h"
 
-#include "common/Timer.h"
 #include "common/ceph_argparse.h"
 #include "common/errno.h"
-#include "mon/MDSMonitor.h"
-#include "mon/OSDMonitor.h"
-#include "mon/PGMonitor.h"
-
 #include <sstream>
 #include "common/config.h"
 #include "common/cmdparse.h"
-#include "include/str_list.h"
+
 #include "include/assert.h"
+#include "include/stringify.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 1dcc2a1d9a33ea6fa24f8c40eb8bfd35cf0eab71..c9f46f054e1a003df3fe0180635719c1b721fe18 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -26,6 +26,7 @@
 #include "PGMonitor.h"
 
 #include "MonitorDBStore.h"
+#include "Session.h"
 
 #include "crush/CrushWrapper.h"
 #include "crush/CrushTester.h"

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 548e13ca676957b77db6b991ae821d264cb96c00..75d15944a5ca5d2c40d251c1540526c9d08f12c6 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -32,19 +32,13 @@ using namespace std;
 #include "osd/OSDMap.h"
 
 #include "PaxosService.h"
-#include "Session.h"
 
 class Monitor;
 class PGMap;
-
-#include "messages/MOSDBoot.h"
-#include "messages/MMonCommand.h"
-#include "messages/MOSDMap.h"
-#include "messages/MPoolOp.h"
+class MonSession;
+class MOSDMap;
 
 #include "erasure-code/ErasureCodeInterface.h"
-
-#include "common/TrackedOp.h"
 #include "mon/MonOpRequest.h"
 
 #define OSD_METADATA_PREFIX "osd_metadata"

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 4407814c8cbf6feb32f5faca12defbef4b6302e5..df7d6c79929abe587f77a2646d3372ac989d596a 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -6,10 +6,8 @@
 #define dout_subsys ceph_subsys_mon
 #include "common/debug.h"
 #include "common/TextTable.h"
-#include "include/stringify.h"
 #include "common/Formatter.h"
 #include "include/ceph_features.h"
-#include "mon/MonitorDBStore.h"
 #include "osd/osd_types.h"
 
 // --

diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index 335c1207bc9fc5c8bb9aa1869281817184dceb31..20f86db9269677bd1b9429bfa9390315e9b4e070 100644 (file)
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -23,11 +23,8 @@
 
 #include "common/debug.h"
 #include "osd/osd_types.h"
-#include "common/config.h"
 #include <sstream>
 
-#include "MonitorDBStore.h"
-
 namespace ceph { class Formatter; }
 
 class PGMap {

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 3055fad99113b9bc8a6328b5d7652998b66314ed..741e06db3fb6c269f5992d4e1774c69637621f2b 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -17,7 +17,6 @@
 #include "common/debug.h"               // undo damage
 #include "PGMonitor.h"
 #include "Monitor.h"
-#include "MDSMonitor.h"
 #include "OSDMonitor.h"
 #include "MonitorDBStore.h"
 
@@ -32,11 +31,9 @@
 #include "messages/MMonCommand.h"
 #include "messages/MOSDScrub.h"
 
-#include "common/Timer.h"
 #include "common/Formatter.h"
-#include "common/ceph_argparse.h"
-#include "common/perf_counters.h"
 #include "common/TextTable.h"
+#include "common/config.h"
 
 #include "include/stringify.h"
 
@@ -47,8 +44,6 @@
 #include "common/strtol.h"
 #include "include/str_list.h"
 #include <sstream>
-#include <boost/variant.hpp>
-#include "common/cmdparse.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix

diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h
index e4081f1aba0d4e024889794b33d1613a9593f15d..b02003b5e8c89b81add49a7e43b6b60677d85b6d 100644 (file)
--- a/src/mon/PGMonitor.h
+++ b/src/mon/PGMonitor.h
@@ -30,17 +30,15 @@ using namespace std;
 #include "include/utime.h"
 #include "common/histogram.h"
 #include "msg/Messenger.h"
-#include "common/config.h"
 #include "mon/MonitorDBStore.h"
 
-#include "messages/MPGStats.h"
-#include "messages/MPGStatsAck.h"
 class MStatfs;
 class MMonCommand;
 class MGetPoolStats;
 
 class RatioMonitor;
 class TextTable;
+class MPGStats;
 
 class PGMonitor : public PaxosService {
 public:

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index b0df122804c0e36c95d757bd796e1fc261a18857..be44f3479c1d9b06e13cab7e091d579e93f57635 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -15,14 +15,13 @@
 #include <sstream>
 #include "Paxos.h"
 #include "Monitor.h"
-#include "MonitorDBStore.h"
-
 #include "messages/MMonPaxos.h"
 
 #include "common/config.h"
 #include "include/assert.h"
 #include "include/stringify.h"
-#include "common/Formatter.h"
+#include "common/Timer.h"
+#include "messages/PaxosServiceMessage.h"
 
 #define dout_subsys ceph_subsys_paxos
 #undef dout_prefix

diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h
index f2b0a3059e3155887b7eba2321fd156f7be79c8f..db6438f1a197b426f1a98b5d940afce406016046 100644 (file)
--- a/src/mon/Paxos.h
+++ b/src/mon/Paxos.h
@@ -112,12 +112,8 @@ e 12v
 #include "include/types.h"
 #include "mon_types.h"
 #include "include/buffer.h"
-#include "messages/PaxosServiceMessage.h"
 #include "msg/msg_types.h"
-
 #include "include/Context.h"
-
-#include "common/Timer.h"
 #include "common/perf_counters.h"
 #include <errno.h>
 

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index cde3faa3546d8e9647569da84c8445d741bf8b6d..0ab108694217113c79c4fd6dae2ecd39fe4af6c6 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -14,14 +14,9 @@
 
 #include "PaxosService.h"
 #include "common/Clock.h"
-#include "Monitor.h"
-#include "MonitorDBStore.h"
-
-
 #include "common/config.h"
+#include "include/stringify.h"
 #include "include/assert.h"
-#include "common/Formatter.h"
-
 #include "mon/MonOpRequest.h"
 
 #define dout_subsys ceph_subsys_paxos

diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index 2d2cbe7620d0442928485d1a116f4138383d6920..4f74e0cbe5c5649dac28ca5029bcbbad71bd6e57 100644 (file)
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -15,10 +15,7 @@
 #ifndef CEPH_PAXOSSERVICE_H
 #define CEPH_PAXOSSERVICE_H
 
-#include "messages/PaxosServiceMessage.h"
 #include "include/Context.h"
-#include "include/stringify.h"
-#include <errno.h>
 #include "Paxos.h"
 #include "Monitor.h"
 #include "MonitorDBStore.h"