From 1d291c187ad5d3a49df3c49be31f3d7c4542aac1 Mon Sep 17 00:00:00 2001 From: sage Date: Sat, 7 May 2005 00:13:46 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@213 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/Makefile | 4 ++-- ceph/common/DecayCounter.h | 2 +- ceph/common/LogType.h | 3 ++- ceph/common/Logger.cc | 6 +++--- ceph/common/Logger.h | 3 ++- ceph/common/clock.cc | 2 +- ceph/config.cc | 10 +++++----- ceph/mds/CDir.h | 2 +- ceph/mds/CInode.h | 2 +- ceph/mds/MDBalancer.cc | 4 ++-- ceph/mds/MDLog.cc | 4 ++-- ceph/mds/MDS.cc | 6 +++--- ceph/mds/MDS.h | 4 ++-- ceph/msg/FakeMessenger.cc | 5 +++-- 14 files changed, 30 insertions(+), 27 deletions(-) diff --git a/ceph/Makefile b/ceph/Makefile index d6b1e284e6188..6dc62b663b58e 100644 --- a/ceph/Makefile +++ b/ceph/Makefile @@ -28,8 +28,8 @@ MDS_OBJS= \ COMMON_OBJS= \ msg/Messenger.o\ msg/error.o\ - Logger.o\ - clock.o\ + common/Logger.o\ + common/clock.o\ config.o TEST_TARGETS = fakemds mpitest fakefuse diff --git a/ceph/common/DecayCounter.h b/ceph/common/DecayCounter.h index e2db062083242..6a1b234d9ae68 100644 --- a/ceph/common/DecayCounter.h +++ b/ceph/common/DecayCounter.h @@ -3,7 +3,7 @@ #define __DECAYCOUNTER_H #include -#include "include/Clock.h" +#include "Clock.h" class DecayCounter { protected: diff --git a/ceph/common/LogType.h b/ceph/common/LogType.h index 850938f8edf50..3789aa3fb4a62 100644 --- a/ceph/common/LogType.h +++ b/ceph/common/LogType.h @@ -1,7 +1,8 @@ #ifndef __LOGTYPE_H #define __LOGTYPE_H -#include "types.h" +#include "include/types.h" + #include #include #include diff --git a/ceph/common/Logger.cc b/ceph/common/Logger.cc index cdd008c8a1d11..df8d1f9bb936c 100644 --- a/ceph/common/Logger.cc +++ b/ceph/common/Logger.cc @@ -1,11 +1,11 @@ #include -#include "include/LogType.h" -#include "include/Logger.h" +#include "LogType.h" +#include "Logger.h" #include -#include "include/Clock.h" +#include "Clock.h" #include "include/config.h" diff --git a/ceph/common/Logger.h b/ceph/common/Logger.h index 5b90e531bb26a..8e0a565d3636b 100644 --- a/ceph/common/Logger.h +++ b/ceph/common/Logger.h @@ -1,7 +1,8 @@ #ifndef __LOGGER_H #define __LOGGER_H -#include "types.h" +#include "include/types.h" + #include #include using namespace std; diff --git a/ceph/common/clock.cc b/ceph/common/clock.cc index f57590231d059..a08863c7f200f 100644 --- a/ceph/common/clock.cc +++ b/ceph/common/clock.cc @@ -1,5 +1,5 @@ #include -#include "include/Clock.h" +#include "Clock.h" #include "include/config.h" diff --git a/ceph/config.cc b/ceph/config.cc index 9edfffb5599c1..6df77120d45ac 100644 --- a/ceph/config.cc +++ b/ceph/config.cc @@ -18,7 +18,7 @@ md_config_t g_conf = { osd_cow: false, // crashy? true, - // profiling + // profiling and debugging log_messages: true, log_interval: 10.0, @@ -27,13 +27,13 @@ md_config_t g_conf = { debug: 13, - // client + // --- client --- client_cache_size: 400, client_cache_mid: .5, client_cache_stat_ttl: 10, // seconds until cached stat results become invalid client_use_random_mds: false, - // mds + // --- mds --- mds_log_max_len: 1000, mds_log_max_trimming: 16, mds_log_read_inc: 4096, @@ -48,9 +48,9 @@ md_config_t g_conf = { mds_verify_export_dirauth: true, mds_log_before_reply: true, - // --- fakeclient + // --- fakeclient (mds regression testing) --- num_fakeclient: 1000, - fakeclient_requests: 30, + fakeclient_requests: 10, fakeclient_deterministic: false, fakeclient_op_statfs: false, diff --git a/ceph/mds/CDir.h b/ceph/mds/CDir.h index d6da67ae7f39a..1cad2a338abe8 100644 --- a/ceph/mds/CDir.h +++ b/ceph/mds/CDir.h @@ -4,7 +4,7 @@ #include "include/types.h" #include "include/config.h" -#include "include/DecayCounter.h" +#include "common/DecayCounter.h" #include #include diff --git a/ceph/mds/CInode.h b/ceph/mds/CInode.h index 89ec9ac6f3c82..2e553e687381e 100644 --- a/ceph/mds/CInode.h +++ b/ceph/mds/CInode.h @@ -5,7 +5,7 @@ #include "include/config.h" #include "include/types.h" #include "include/lru.h" -#include "include/DecayCounter.h" +#include "common/DecayCounter.h" #include #include "CDentry.h" diff --git a/ceph/mds/MDBalancer.cc b/ceph/mds/MDBalancer.cc index 0a3fac7cf4b3d..1516788f1e695 100644 --- a/ceph/mds/MDBalancer.cc +++ b/ceph/mds/MDBalancer.cc @@ -7,9 +7,9 @@ #include "CDir.h" #include "MDCache.h" -#include "messages/MHeartbeat.h" -#include "msg/Messenger.h" #include "include/Context.h" +#include "msg/Messenger.h" +#include "messages/MHeartbeat.h" #include #include diff --git a/ceph/mds/MDLog.cc b/ceph/mds/MDLog.cc index ed17bdc0dc0ef..adad8a4be0703 100644 --- a/ceph/mds/MDLog.cc +++ b/ceph/mds/MDLog.cc @@ -6,8 +6,8 @@ #include "LogStream.h" #include "LogEvent.h" -#include "include/LogType.h" -#include "include/Logger.h" +#include "common/LogType.h" +#include "common/Logger.h" #include "msg/Message.h" LogType mdlog_logtype; diff --git a/ceph/mds/MDS.cc b/ceph/mds/MDS.cc index 6004eb9f0938d..d6eae05e8ad89 100644 --- a/ceph/mds/MDS.cc +++ b/ceph/mds/MDS.cc @@ -1,6 +1,6 @@ #include "include/types.h" -#include "include/Clock.h" +#include "common/Clock.h" #include "msg/Messenger.h" @@ -15,8 +15,8 @@ #include "include/filepath.h" -#include "include/Logger.h" -#include "include/LogType.h" +#include "common/Logger.h" +#include "common/LogType.h" #include "messages/MPing.h" #include "messages/MGenericMessage.h" diff --git a/ceph/mds/MDS.h b/ceph/mds/MDS.h index 24f2dcc03b1c6..a68eda70eff59 100644 --- a/ceph/mds/MDS.h +++ b/ceph/mds/MDS.h @@ -16,8 +16,8 @@ using namespace __gnu_cxx; #include "msg/Dispatcher.h" #include "include/types.h" #include "include/Context.h" -#include "include/DecayCounter.h" -#include "include/Logger.h" +#include "common/DecayCounter.h" +#include "common/Logger.h" typedef __uint64_t object_t; diff --git a/ceph/msg/FakeMessenger.cc b/ceph/msg/FakeMessenger.cc index 13a28c729279f..6c418caa42d62 100644 --- a/ceph/msg/FakeMessenger.cc +++ b/ceph/msg/FakeMessenger.cc @@ -4,8 +4,9 @@ #include "Message.h" #include "FakeMessenger.h" #include "mds/MDS.h" -#include "include/LogType.h" -#include "include/Logger.h" + +#include "common/LogType.h" +#include "common/Logger.h" #include "include/config.h" -- 2.39.5