diff options
Diffstat (limited to 'src/mon/Monitor.cc')
| -rw-r--r-- | src/mon/Monitor.cc | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 7cae0417439..9f5e3395256 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -11,21 +11,27 @@ * Foundation. See file COPYING. * */ - +#include "mon_types.h" #include <sstream> #include <stdlib.h> #include <signal.h> #include <limits.h> -#include "Monitor.h" +#include "include/color.h" +#include "include/ceph_fs.h" +#include "include/str_list.h" +#include "include/assert.h" +#include "common/config.h" #include "common/version.h" - -#include "osd/OSDMap.h" - -#include "MonitorStore.h" - -#include "msg/Messenger.h" +#include "common/strtol.h" +#include "common/ceph_argparse.h" +#include "common/Clock.h" +#include "common/errno.h" +#include "common/perf_counters.h" +#include "common/admin_socket.h" +#include "global/global_context.h" +#include "global/debug.h" #include "messages/PaxosServiceMessage.h" #include "messages/MMonMap.h" @@ -33,45 +39,25 @@ #include "messages/MMonGetVersion.h" #include "messages/MMonGetVersionReply.h" #include "messages/MGenericMessage.h" -#include "messages/MMonCommand.h" #include "messages/MMonCommandAck.h" #include "messages/MMonProbe.h" #include "messages/MMonJoin.h" #include "messages/MMonPaxos.h" #include "messages/MRoute.h" #include "messages/MForward.h" - #include "messages/MMonSubscribe.h" #include "messages/MMonSubscribeAck.h" - #include "messages/MAuthReply.h" -#include "common/strtol.h" -#include "common/ceph_argparse.h" -#include "common/Timer.h" -#include "common/Clock.h" -#include "common/errno.h" -#include "common/perf_counters.h" -#include "common/admin_socket.h" - -#include "include/color.h" -#include "include/ceph_fs.h" -#include "include/str_list.h" - #include "OSDMonitor.h" #include "MDSMonitor.h" #include "MonmapMonitor.h" #include "PGMonitor.h" #include "LogMonitor.h" #include "AuthMonitor.h" +#include "MonitorStore.h" -#include "auth/AuthMethodList.h" -#include "auth/KeyRing.h" - -#include "common/config.h" -#include "include/assert.h" - -#include "global/debug.h" +#include "Monitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix |