From: Adam C. Emerson Date: Wed, 16 Nov 2016 17:38:08 +0000 (-0500) Subject: dout: Use dout_context X-Git-Tag: v12.0.0~384^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9182564c716fdfcb39cc77314ba295990dd4312;p=ceph.git dout: Use dout_context As a transition for g_ceph_context removal, make all dout macros depends on a local macro. Signed-off-by: Adam C. Emerson --- diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc index 06a1e4150040..f3ec61215799 100644 --- a/src/ceph_fuse.cc +++ b/src/ceph_fuse.cc @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab /* * Ceph - scalable distributed file system @@ -7,9 +7,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #include @@ -37,12 +37,14 @@ using namespace std; #include "global/signal_handler.h" #include "common/Preforker.h" #include "common/safe_io.h" - + #include #include #include +#define dout_context g_ceph_context + static void fuse_usage() { const char **argv = (const char **) malloc((2) * sizeof(char *)); diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 5f8173e724e0..a444d573975a 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -46,6 +46,7 @@ using namespace std; #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds void usage() diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index db1e4a9a143c..31c0e637c8dd 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -47,6 +47,7 @@ using namespace std; #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd namespace { diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc index 9fab5214c4d4..73024ff4842e 100644 --- a/src/client/SyntheticClient.cc +++ b/src/client/SyntheticClient.cc @@ -39,6 +39,7 @@ using namespace std; #include "include/assert.h" #include "include/cephfs/ceph_statx.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_client #undef dout_prefix #define dout_prefix *_dout << "client." << (whoami >= 0 ? whoami:client->get_nodeid()) << " " diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc index a0b9e06388de..1fdd3289a938 100644 --- a/src/client/fuse_ll.cc +++ b/src/client/fuse_ll.cc @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab /* * Ceph - scalable distributed file system @@ -7,9 +7,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #include @@ -38,6 +38,8 @@ #include #include +#define dout_context g_ceph_context + #define FINO_INO(x) ((x) & ((1ull<<48)-1ull)) #define FINO_STAG(x) ((x) >> 48) #define MAKE_FINO(i,s) ((i) | ((s) << 48)) diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc index 030b9a223198..00f66c7cefae 100644 --- a/src/common/TrackedOp.cc +++ b/src/common/TrackedOp.cc @@ -19,6 +19,7 @@ #include "msg/Message.h" #include "include/assert.h" +#define dout_context cct #define dout_subsys ceph_subsys_optracker #undef dout_prefix #define dout_prefix _prefix(_dout) @@ -223,10 +224,10 @@ bool OpTracker::check_ops_in_flight(std::vector &warning_vector, int *sl if (oldest_op_tmp < oldest_op) { oldest_op = oldest_op_tmp; } - } + } total_ops_in_flight += sdata->ops_in_flight_sharded.size(); } - + if (0 == total_ops_in_flight) return false; diff --git a/src/common/debug.h b/src/common/debug.h index 1f4f8c66a09a..3a3e88aa640e 100644 --- a/src/common/debug.h +++ b/src/common/debug.h @@ -20,16 +20,16 @@ /* Global version of the stuff in common/dout.h */ -#define dout(v) ldout((g_ceph_context), v) +#define dout(v) ldout((dout_context), v) -#define pdout(v, p) lpdout((g_ceph_context), v, p) +#define pdout(v, p) lpdout((dout_context), v, p) -#define dlog_p(sub, v) ldlog_p1((g_ceph_context), sub, v) +#define dlog_p(sub, v) ldlog_p1((dout_context), sub, v) -#define generic_dout(v) lgeneric_dout((g_ceph_context), v) +#define generic_dout(v) lgeneric_dout((dout_context), v) -#define derr lderr((g_ceph_context)) +#define derr lderr((dout_context)) -#define generic_derr lgeneric_derr((g_ceph_context)) +#define generic_derr lgeneric_derr((dout_context)) #endif diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc index 45338588be37..beb2f195d40c 100644 --- a/src/compressor/zlib/ZlibCompressor.cc +++ b/src/compressor/zlib/ZlibCompressor.cc @@ -22,6 +22,7 @@ #include // ----------------------------------------------------------------------------- +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_compressor #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/erasure-code/isa/ErasureCodeIsa.cc b/src/erasure-code/isa/ErasureCodeIsa.cc index acf63d86f43c..0d69e8cb7bb6 100644 --- a/src/erasure-code/isa/ErasureCodeIsa.cc +++ b/src/erasure-code/isa/ErasureCodeIsa.cc @@ -27,6 +27,7 @@ extern "C" { #include "isa-l/include/erasure_code.h" } // ----------------------------------------------------------------------------- +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/erasure-code/isa/ErasureCodeIsaTableCache.cc b/src/erasure-code/isa/ErasureCodeIsaTableCache.cc index fa834ab9f8ef..951f7d083083 100644 --- a/src/erasure-code/isa/ErasureCodeIsaTableCache.cc +++ b/src/erasure-code/isa/ErasureCodeIsaTableCache.cc @@ -30,6 +30,7 @@ // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _tc_prefix(_dout) diff --git a/src/erasure-code/jerasure/ErasureCodeJerasure.cc b/src/erasure-code/jerasure/ErasureCodeJerasure.cc index 408f51f52e3e..1d411b9c247e 100644 --- a/src/erasure-code/jerasure/ErasureCodeJerasure.cc +++ b/src/erasure-code/jerasure/ErasureCodeJerasure.cc @@ -29,6 +29,7 @@ extern "C" { #define LARGEST_VECTOR_WORDSIZE 16 +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc b/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc index 3ccedb9699db..ac6923e33665 100644 --- a/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc +++ b/src/erasure-code/jerasure/ErasureCodePluginJerasure.cc @@ -21,6 +21,7 @@ #include "ErasureCodePluginJerasure.h" #include "jerasure_init.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/erasure-code/jerasure/jerasure_init.cc b/src/erasure-code/jerasure/jerasure_init.cc index d05c6ceab7ff..4c8c0e49dbef 100644 --- a/src/erasure-code/jerasure/jerasure_init.cc +++ b/src/erasure-code/jerasure/jerasure_init.cc @@ -22,6 +22,8 @@ extern "C" { #include "galois.h" } +#define dout_context g_ceph_context + extern "C" int jerasure_init(int count, int *words) { for(int i = 0; i < count; i++) { diff --git a/src/erasure-code/lrc/ErasureCodeLrc.cc b/src/erasure-code/lrc/ErasureCodeLrc.cc index 2a17ef831989..a60fa6e08615 100644 --- a/src/erasure-code/lrc/ErasureCodeLrc.cc +++ b/src/erasure-code/lrc/ErasureCodeLrc.cc @@ -31,6 +31,7 @@ // re-include our assert to clobber boost's #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/erasure-code/shec/ErasureCodePluginShec.cc b/src/erasure-code/shec/ErasureCodePluginShec.cc index b55be7739296..ded31692f50f 100644 --- a/src/erasure-code/shec/ErasureCodePluginShec.cc +++ b/src/erasure-code/shec/ErasureCodePluginShec.cc @@ -25,6 +25,8 @@ #include "ErasureCodeShec.h" #include "jerasure_init.h" +#define dout_context g_ceph_context + #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc index e580969a37d9..139b7b9e8042 100644 --- a/src/erasure-code/shec/ErasureCodeShec.cc +++ b/src/erasure-code/shec/ErasureCodeShec.cc @@ -35,6 +35,7 @@ extern int calc_determinant(int *matrix, int dim); extern int* reed_sol_vandermonde_coding_matrix(int k, int m, int w); } +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/erasure-code/shec/ErasureCodeShecTableCache.cc b/src/erasure-code/shec/ErasureCodeShecTableCache.cc index ebd32db0ae5b..6f0c1d83c8a1 100644 --- a/src/erasure-code/shec/ErasureCodeShecTableCache.cc +++ b/src/erasure-code/shec/ErasureCodeShecTableCache.cc @@ -24,6 +24,7 @@ // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _tc_prefix(_dout) diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 03669e914f3f..772140adb26b 100644 --- a/src/global/global_init.cc +++ b/src/global/global_init.cc @@ -36,6 +36,7 @@ #include #endif +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_ static void global_init_set_globals(CephContext *cct) diff --git a/src/global/pidfile.cc b/src/global/pidfile.cc index 2f70cd02e110..14e5871872a3 100644 --- a/src/global/pidfile.cc +++ b/src/global/pidfile.cc @@ -36,6 +36,7 @@ // logging is not functional when it is called. cerr output is lost // when the caller is daemonized but it will show if not (-f) // +#define dout_context g_ceph_context #define dout_prefix *_dout #define dout_subsys ceph_subsys_ diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc index 01732cce4480..7d5069828c14 100644 --- a/src/global/signal_handler.cc +++ b/src/global/signal_handler.cc @@ -31,6 +31,8 @@ extern char *sys_siglist[]; #endif +#define dout_context g_ceph_context + void install_sighandler(int signum, signal_handler_t handler, int flags) { int ret; diff --git a/src/kv/LevelDBStore.cc b/src/kv/LevelDBStore.cc index 9d8e1e402d58..b2793653ac42 100644 --- a/src/kv/LevelDBStore.cc +++ b/src/kv/LevelDBStore.cc @@ -11,6 +11,7 @@ using std::string; #include "common/debug.h" #include "common/perf_counters.h" +#define dout_context cct #define dout_subsys ceph_subsys_leveldb #undef dout_prefix #define dout_prefix *_dout << "leveldb: " diff --git a/src/kv/MemDB.cc b/src/kv/MemDB.cc index 7ef18fc25ecf..cd70bb81b7a9 100644 --- a/src/kv/MemDB.cc +++ b/src/kv/MemDB.cc @@ -27,6 +27,7 @@ #include "common/errno.h" #include "include/compat.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_memdb #undef dout_prefix #define dout_prefix *_dout << "memdb: " diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc index 41c7221902e1..2e339c062c55 100644 --- a/src/kv/RocksDBStore.cc +++ b/src/kv/RocksDBStore.cc @@ -29,6 +29,7 @@ using std::string; #include "common/debug.h" +#define dout_context cct #define dout_subsys ceph_subsys_rocksdb #undef dout_prefix #define dout_prefix *_dout << "rocksdb: " diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc index 36c7d882e099..c8a88de7170b 100644 --- a/src/mds/Beacon.cc +++ b/src/mds/Beacon.cc @@ -27,6 +27,7 @@ #include "Beacon.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds.beacon." << name << ' ' diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc index c528a028f708..032f83a4297a 100644 --- a/src/mds/CDentry.cc +++ b/src/mds/CDentry.cc @@ -25,12 +25,13 @@ #include "messages/MLock.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") " -ostream& CDentry::print_db_line_prefix(ostream& out) +ostream& CDentry::print_db_line_prefix(ostream& out) { return out << ceph_clock_now() << " mds." << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->ino() << " " << name << ") "; } diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index f3a7ce859239..270abdb5071a 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -37,6 +37,7 @@ #include "include/assert.h" #include "include/compat.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") " diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index d2239317cdb1..1e7431100ae5 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -48,6 +48,7 @@ #include "mds/MDSContinuation.h" #include "mds/InoTable.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") " diff --git a/src/mds/CInode.h b/src/mds/CInode.h index 3a59eb40bedf..d58c7d00a639 100644 --- a/src/mds/CInode.h +++ b/src/mds/CInode.h @@ -37,6 +37,8 @@ #include #include +#define dout_context g_ceph_context + class Context; class CDentry; class CDir; @@ -1161,4 +1163,5 @@ private: ostream& operator<<(ostream& out, const CInode::scrub_stamp_info_t& si); +#undef dout_context #endif diff --git a/src/mds/DamageTable.cc b/src/mds/DamageTable.cc index 58aa0e4ba939..c19f4e2c93ee 100644 --- a/src/mds/DamageTable.cc +++ b/src/mds/DamageTable.cc @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab /* * Ceph - scalable distributed file system @@ -7,9 +7,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #include "common/debug.h" @@ -18,6 +18,7 @@ #include "DamageTable.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << rank << ".damage " << __func__ << " " diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc index 9b6029c5e365..e21543cde1aa 100644 --- a/src/mds/InoTable.cc +++ b/src/mds/InoTable.cc @@ -19,6 +19,7 @@ #include "common/config.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << rank << "." << table_name << ": " diff --git a/src/mds/JournalPointer.cc b/src/mds/JournalPointer.cc index d8c43aa5a9d6..e0ea57ce4cbb 100644 --- a/src/mds/JournalPointer.cc +++ b/src/mds/JournalPointer.cc @@ -22,6 +22,7 @@ #include "mds/JournalPointer.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_journaler #undef dout_prefix #define dout_prefix *_dout << objecter->messenger->get_myname() << ".journalpointer " diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index f576a1a539e0..59ab488a3c32 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -49,6 +49,7 @@ #undef dout_prefix #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_locker +#define dout_context g_ceph_context #define dout_prefix _prefix(_dout, mds) static ostream& _prefix(std::ostream *_dout, MDSRank *mds) { return *_dout << "mds." << mds->get_nodeid() << ".locker "; @@ -5180,7 +5181,7 @@ void Locker::handle_file_lock(ScatterLock *lock, MLock *m) << " on " << *lock->get_parent() << dendl; scatter_nudge(lock, 0, true); mds->mdlog->flush(); - } + } break; default: diff --git a/src/mds/LogEvent.cc b/src/mds/LogEvent.cc index c933261a8aa0..90d84deaf29a 100644 --- a/src/mds/LogEvent.cc +++ b/src/mds/LogEvent.cc @@ -38,6 +38,8 @@ #include "events/ENoOp.h" +#define dout_context g_ceph_context + LogEvent *LogEvent::decode(bufferlist& bl) { diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc index b8fd8fc48d03..e16c40964eb5 100644 --- a/src/mds/MDBalancer.cc +++ b/src/mds/MDBalancer.cc @@ -39,6 +39,7 @@ using std::vector; #include "common/config.h" #include "common/errno.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_balancer diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 5d0e6cad6b11..919d63310897 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -103,6 +103,7 @@ using namespace std; #include "common/config.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix _prefix(_dout, mds) @@ -245,7 +246,7 @@ void MDCache::log_stat() } -// +// bool MDCache::shutdown() { diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 267da464d22c..4bc77b58ed85 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -31,6 +31,7 @@ #include "common/errno.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log diff --git a/src/mds/MDSContext.cc b/src/mds/MDSContext.cc index 4188d8166ac8..3d1d1688620e 100644 --- a/src/mds/MDSContext.cc +++ b/src/mds/MDSContext.cc @@ -18,9 +18,9 @@ #include "MDSContext.h" #include "common/dout.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds - void MDSInternalContextBase::complete(int r) { MDSRank *mds = get_mds(); diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc index d9c60fb986a0..632e75e5249e 100644 --- a/src/mds/MDSDaemon.cc +++ b/src/mds/MDSDaemon.cc @@ -63,7 +63,7 @@ #include "perfglue/cpu_profiler.h" #include "perfglue/heap_profiler.h" - +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << name << ' ' diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 79bc25ba2265..3b66fc9833e1 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -36,6 +36,7 @@ #include "MDSRank.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << whoami << '.' << incarnation << ' ' diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc index 9f9515adf13b..0917110cfdeb 100644 --- a/src/mds/MDSTable.cc +++ b/src/mds/MDSTable.cc @@ -28,6 +28,7 @@ #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << rank << "." << table_name << ": " diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc index f56c4ff8fbbc..8d66116c23b1 100644 --- a/src/mds/MDSTableClient.cc +++ b/src/mds/MDSTableClient.cc @@ -30,6 +30,7 @@ #include "common/config.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".tableclient(" << get_mdstable_name(table) << ") " diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc index 5e7ec3fbdedb..83987e8e07ca 100644 --- a/src/mds/MDSTableServer.cc +++ b/src/mds/MDSTableServer.cc @@ -20,6 +20,7 @@ #include "messages/MMDSTableRequest.h" #include "events/ETableServer.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << rank << ".tableserver(" << get_mdstable_name(table) << ") " diff --git a/src/mds/Mantle.cc b/src/mds/Mantle.cc index d0520c27014b..323d8bc54426 100644 --- a/src/mds/Mantle.cc +++ b/src/mds/Mantle.cc @@ -19,6 +19,7 @@ #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds_balancer #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_balancer diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 0008ef06c858..bd3edabd56f3 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -76,6 +76,7 @@ #include "common/config.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef DOUT_COND #define DOUT_COND(cct, l) (l <= cct->_conf->debug_mds || l <= cct->_conf->debug_mds_migrator) diff --git a/src/mds/RecoveryQueue.cc b/src/mds/RecoveryQueue.cc index bb42b21b905b..9f1f236fa961 100644 --- a/src/mds/RecoveryQueue.cc +++ b/src/mds/RecoveryQueue.cc @@ -21,6 +21,7 @@ #include "RecoveryQueue.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << " RecoveryQueue::" << __func__ << " " diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc index afc91c3961bf..ab23531c92e1 100644 --- a/src/mds/ScrubStack.cc +++ b/src/mds/ScrubStack.cc @@ -20,6 +20,7 @@ #include "mds/MDCache.h" #include "mds/MDSContinuation.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix _prefix(_dout, scrubstack->mdcache->mds) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 5b06470ae8ef..e0b09360410b 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -66,6 +66,7 @@ using namespace std; #include "common/config.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".server " @@ -144,7 +145,7 @@ void Server::dispatch(Message *m) } // active? - if (!mds->is_active() && + if (!mds->is_active() && !(mds->is_stopping() && m->get_source().is_mds())) { if (m->get_type() == CEPH_MSG_CLIENT_REQUEST && (mds->is_reconnect() || mds->get_want_state() == CEPH_MDS_STATE_RECONNECT)) { diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc index e7dd17534ee6..06331a09b96a 100644 --- a/src/mds/SessionMap.cc +++ b/src/mds/SessionMap.cc @@ -24,6 +24,7 @@ #include "include/assert.h" #include "include/stringify.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << rank << ".sessionmap " diff --git a/src/mds/SnapRealm.cc b/src/mds/SnapRealm.cc index 137a476a3d07..3f9b93d3a2b3 100644 --- a/src/mds/SnapRealm.cc +++ b/src/mds/SnapRealm.cc @@ -23,6 +23,7 @@ * SnapRealm */ +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix _prefix(_dout, mdcache->mds->get_nodeid(), inode, srnode.seq, this) diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc index 8ffc4258949a..4518abef6cfd 100644 --- a/src/mds/SnapServer.cc +++ b/src/mds/SnapServer.cc @@ -27,6 +27,7 @@ #include "common/config.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << rank << ".snap " diff --git a/src/mds/StrayManager.cc b/src/mds/StrayManager.cc index d7f449b66bd1..403dbe7561a9 100644 --- a/src/mds/StrayManager.cc +++ b/src/mds/StrayManager.cc @@ -27,6 +27,7 @@ #include "StrayManager.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix _prefix(_dout, mds) diff --git a/src/mds/journal.cc b/src/mds/journal.cc index c0c6e93e5b3b..f34d343fcc07 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -52,6 +52,7 @@ #include "Locker.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef DOUT_COND #define DOUT_COND(cct, l) (l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log \ diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc index 027b461efadc..a00040865253 100644 --- a/src/mgr/ClusterState.cc +++ b/src/mgr/ClusterState.cc @@ -16,6 +16,7 @@ #include "mgr/ClusterState.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr #undef dout_prefix #define dout_prefix *_dout << "mgr " << __func__ << " " diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index fccb377e581d..3b8def2f6e4f 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -19,6 +19,7 @@ #include "messages/MCommandReply.h" #include "messages/MPGStats.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr #undef dout_prefix #define dout_prefix *_dout << "mgr.server " << __func__ << " " diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc index 07af2be2a1b5..132f722947b6 100644 --- a/src/mgr/DaemonState.cc +++ b/src/mgr/DaemonState.cc @@ -13,6 +13,7 @@ #include "DaemonState.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr #undef dout_prefix #define dout_prefix *_dout << "mgr " << __func__ << " " diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc index d068af6a5101..8faf6bdf6b17 100644 --- a/src/mgr/Mgr.cc +++ b/src/mgr/Mgr.cc @@ -31,6 +31,7 @@ #include "Mgr.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr #undef dout_prefix #define dout_prefix *_dout << "mgr " << __func__ << " " diff --git a/src/mgr/MgrPyModule.cc b/src/mgr/MgrPyModule.cc index 218444a861c9..72ad59491e53 100644 --- a/src/mgr/MgrPyModule.cc +++ b/src/mgr/MgrPyModule.cc @@ -19,6 +19,7 @@ #include "MgrPyModule.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr #undef dout_prefix #define dout_prefix *_dout << "mgr " << __func__ << " " diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc index b159021f5038..7a87e60886b7 100644 --- a/src/mgr/MgrStandby.cc +++ b/src/mgr/MgrStandby.cc @@ -27,6 +27,7 @@ #include "MgrStandby.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr #undef dout_prefix #define dout_prefix *_dout << "mgr " << __func__ << " " diff --git a/src/mgr/PyModules.cc b/src/mgr/PyModules.cc index c2b79655ad36..e55183ae45b0 100644 --- a/src/mgr/PyModules.cc +++ b/src/mgr/PyModules.cc @@ -27,6 +27,7 @@ #include "PyModules.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr #undef dout_prefix #define dout_prefix *_dout << "mgr " << __func__ << " " diff --git a/src/mgr/PyState.cc b/src/mgr/PyState.cc index 69fc37ff6981..6027fc7ddf17 100644 --- a/src/mgr/PyState.cc +++ b/src/mgr/PyState.cc @@ -22,6 +22,8 @@ #include "PyState.h" +#define dout_context g_ceph_context + PyModules *global_handle = NULL; diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h index dcd2b1554f3d..2fd7941225f1 100644 --- a/src/mon/MonitorDBStore.h +++ b/src/mon/MonitorDBStore.h @@ -30,6 +30,8 @@ #include "common/debug.h" #include "common/safe_io.h" +#define dout_context g_ceph_context + class MonitorDBStore { string path; diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 984776960f7b..85216fbc6aed 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -12,6 +12,8 @@ #include "osd/osd_types.h" #include "osd/OSDMap.h" +#define dout_context g_ceph_context + // -- void PGMap::Incremental::encode(bufferlist &bl, uint64_t features) const diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc index 1f75db973e78..a406baf872f2 100644 --- a/src/objclass/class_api.cc +++ b/src/objclass/class_api.cc @@ -15,6 +15,7 @@ static ClassHandler *ch; +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_objclass void cls_initialize(ClassHandler *h) diff --git a/src/os/FuseStore.cc b/src/os/FuseStore.cc index c8c6c909e16f..bf767b11db27 100644 --- a/src/os/FuseStore.cc +++ b/src/os/FuseStore.cc @@ -20,6 +20,7 @@ #include #endif +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_fuse #include "common/debug.h" #undef dout_prefix diff --git a/src/os/bluestore/Allocator.cc b/src/os/bluestore/Allocator.cc index 115bd0cfa448..638c7830e8ea 100644 --- a/src/os/bluestore/Allocator.cc +++ b/src/os/bluestore/Allocator.cc @@ -6,6 +6,7 @@ #include "BitMapAllocator.h" #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluestore Allocator *Allocator::create(string type, diff --git a/src/os/bluestore/BitAllocator.cc b/src/os/bluestore/BitAllocator.cc index 309d19ae2040..0a8b3379fa42 100644 --- a/src/os/bluestore/BitAllocator.cc +++ b/src/os/bluestore/BitAllocator.cc @@ -25,6 +25,7 @@ #include "common/debug.h" #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluestore #undef dout_prefix #define dout_prefix *_dout << "bitalloc:" diff --git a/src/os/bluestore/BitMapAllocator.cc b/src/os/bluestore/BitMapAllocator.cc index 326442f5edff..497a53cba8f1 100644 --- a/src/os/bluestore/BitMapAllocator.cc +++ b/src/os/bluestore/BitMapAllocator.cc @@ -12,6 +12,7 @@ #include "bluestore_types.h" #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluestore #undef dout_prefix #define dout_prefix *_dout << "bitmapalloc:" diff --git a/src/os/bluestore/BitmapFreelistManager.cc b/src/os/bluestore/BitmapFreelistManager.cc index 8de18d8f86df..bba7a6fe2075 100644 --- a/src/os/bluestore/BitmapFreelistManager.cc +++ b/src/os/bluestore/BitmapFreelistManager.cc @@ -7,6 +7,7 @@ #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluestore #undef dout_prefix #define dout_prefix *_dout << "freelist " diff --git a/src/os/bluestore/BlockDevice.cc b/src/os/bluestore/BlockDevice.cc index 205d81dd10c2..91a5912d21f0 100644 --- a/src/os/bluestore/BlockDevice.cc +++ b/src/os/bluestore/BlockDevice.cc @@ -24,6 +24,7 @@ #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bdev #undef dout_prefix #define dout_prefix *_dout << "bdev " diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 654d12b6c0f3..ac2cdddc74f1 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -9,6 +9,7 @@ #include "BlockDevice.h" #include "Allocator.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluefs #undef dout_prefix #define dout_prefix *_dout << "bluefs " diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 19f87ac332fd..219a3578a136 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -31,6 +31,7 @@ #include "BlueRocksEnv.h" #include "auth/Crypto.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluestore // bluestore_meta_onode diff --git a/src/os/bluestore/ExtentFreelistManager.cc b/src/os/bluestore/ExtentFreelistManager.cc index 3bc0ed9cc977..361a9df67584 100644 --- a/src/os/bluestore/ExtentFreelistManager.cc +++ b/src/os/bluestore/ExtentFreelistManager.cc @@ -7,6 +7,7 @@ #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluestore #undef dout_prefix #define dout_prefix *_dout << "freelist " diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc index 4ed431fe0a4a..2fb8dd260295 100644 --- a/src/os/bluestore/KernelDevice.cc +++ b/src/os/bluestore/KernelDevice.cc @@ -26,6 +26,7 @@ #include "common/blkdev.h" #include "common/align.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bdev #undef dout_prefix #define dout_prefix *_dout << "bdev(" << path << ") " diff --git a/src/os/bluestore/StupidAllocator.cc b/src/os/bluestore/StupidAllocator.cc index c84ae7bb7268..090f1fce8110 100644 --- a/src/os/bluestore/StupidAllocator.cc +++ b/src/os/bluestore/StupidAllocator.cc @@ -5,6 +5,7 @@ #include "bluestore_types.h" #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_bluestore #undef dout_prefix #define dout_prefix *_dout << "stupidalloc " diff --git a/src/os/filestore/BtrfsFileStoreBackend.cc b/src/os/filestore/BtrfsFileStoreBackend.cc index 0d52f1121abf..461d5c182749 100644 --- a/src/os/filestore/BtrfsFileStoreBackend.cc +++ b/src/os/filestore/BtrfsFileStoreBackend.cc @@ -43,6 +43,7 @@ #if defined(__linux__) +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "btrfsfilestorebackend(" << get_basedir_path() << ") " diff --git a/src/os/filestore/DBObjectMap.cc b/src/os/filestore/DBObjectMap.cc index a4685b8c3367..ed42875e68cf 100644 --- a/src/os/filestore/DBObjectMap.cc +++ b/src/os/filestore/DBObjectMap.cc @@ -19,6 +19,7 @@ #include "common/config.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "filestore " diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc index f11e419a944b..55c9b11212a6 100644 --- a/src/os/filestore/FileJournal.cc +++ b/src/os/filestore/FileJournal.cc @@ -41,6 +41,7 @@ #define O_DSYNC O_SYNC #endif +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_journal #undef dout_prefix #define dout_prefix *_dout << "journal " diff --git a/src/os/filestore/FileJournal.h b/src/os/filestore/FileJournal.h index 1d3d6fb5d324..281b03775642 100644 --- a/src/os/filestore/FileJournal.h +++ b/src/os/filestore/FileJournal.h @@ -31,6 +31,9 @@ using std::deque; # include #endif +#define dout_context g_ceph_context + + /** * Implements journaling on top of block device or file. * @@ -536,4 +539,5 @@ private: WRITE_CLASS_ENCODER(FileJournal::header_t) +#undef dout_context #endif diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc index aa3c14110f34..ace293675bee 100644 --- a/src/os/filestore/FileStore.cc +++ b/src/os/filestore/FileStore.cc @@ -90,6 +90,7 @@ using ceph::crypto::SHA1; #define tracepoint(...) #endif +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "filestore(" << basedir << ") " diff --git a/src/os/filestore/GenericFileStoreBackend.cc b/src/os/filestore/GenericFileStoreBackend.cc index ba179b9d6d1c..7206557169b8 100644 --- a/src/os/filestore/GenericFileStoreBackend.cc +++ b/src/os/filestore/GenericFileStoreBackend.cc @@ -46,6 +46,7 @@ #define SLOPPY_CRC_XATTR "user.cephos.scrc" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "genericfilestorebackend(" << get_basedir_path() << ") " diff --git a/src/os/filestore/HashIndex.cc b/src/os/filestore/HashIndex.cc index 897f8c4b9a87..b88fb2a86c63 100644 --- a/src/os/filestore/HashIndex.cc +++ b/src/os/filestore/HashIndex.cc @@ -21,6 +21,7 @@ #include "common/errno.h" #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore const string HashIndex::SUBDIR_ATTR = "contents"; diff --git a/src/os/filestore/JournalingObjectStore.cc b/src/os/filestore/JournalingObjectStore.cc index a3fbb974217c..5163065e336b 100644 --- a/src/os/filestore/JournalingObjectStore.cc +++ b/src/os/filestore/JournalingObjectStore.cc @@ -5,6 +5,7 @@ #include "common/errno.h" #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_journal #undef dout_prefix #define dout_prefix *_dout << "journal " diff --git a/src/os/filestore/LFNIndex.cc b/src/os/filestore/LFNIndex.cc index e0d753ecf44f..23557ad141a4 100644 --- a/src/os/filestore/LFNIndex.cc +++ b/src/os/filestore/LFNIndex.cc @@ -35,6 +35,7 @@ #include "LFNIndex.h" using ceph::crypto::SHA1; +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "LFNIndex(" << get_base_path() << ") " diff --git a/src/os/filestore/XfsFileStoreBackend.cc b/src/os/filestore/XfsFileStoreBackend.cc index 365692ca8671..df9f6e3e3d51 100644 --- a/src/os/filestore/XfsFileStoreBackend.cc +++ b/src/os/filestore/XfsFileStoreBackend.cc @@ -28,6 +28,7 @@ #include "include/assert.h" #include "include/compat.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "xfsfilestorebackend(" << get_basedir_path() << ") " diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc index d4756b12ee58..912a5ebcb9be 100755 --- a/src/os/kstore/KStore.cc +++ b/src/os/kstore/KStore.cc @@ -29,6 +29,7 @@ #include "common/Formatter.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_kstore /* diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc index fd1c1f2ceb35..be3e30641850 100644 --- a/src/os/memstore/MemStore.cc +++ b/src/os/memstore/MemStore.cc @@ -29,6 +29,7 @@ #include "MemStore.h" #include "include/compat.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "memstore(" << path << ") " diff --git a/src/osd/ClassHandler.cc b/src/osd/ClassHandler.cc index 23afdfad5b4d..4ee75d8490ba 100644 --- a/src/osd/ClassHandler.cc +++ b/src/osd/ClassHandler.cc @@ -17,6 +17,7 @@ #include "common/config.h" #include "common/debug.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix *_dout diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 684a9446f19f..4789dc519d91 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -26,6 +26,7 @@ #include "PrimaryLogPG.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #define DOUT_PREFIX_ARGS this #undef dout_prefix diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index f9b49cbb4f0f..c9de4531dd1f 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -149,6 +149,7 @@ #define tracepoint(...) #endif +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout, whoami, get_osdmap_epoch()) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 321c20aa9b00..c55844f5ab57 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab /* * Ceph - scalable distributed file system @@ -7,9 +7,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #include "PG.h" @@ -65,6 +65,7 @@ #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout, this) diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index 199d4ba3a8ea..832911eee993 100644 --- a/src/osd/PGBackend.cc +++ b/src/osd/PGBackend.cc @@ -28,6 +28,7 @@ #include "PGLog.h" #include "common/LogClient.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #define DOUT_PREFIX_ARGS this #undef dout_prefix diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index c07ba17589e9..79e49e713344 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -19,6 +19,7 @@ #include "include/unordered_map.h" #include "common/ceph_context.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout, this) diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 837f69f450dd..0e70dca75dff 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -29,6 +29,8 @@ using namespace std; #define PGLOG_INDEXED_EXTRA_CALLER_OPS (1 << 2) #define PGLOG_INDEXED_ALL (PGLOG_INDEXED_OBJECTS | PGLOG_INDEXED_CALLER_OPS | PGLOG_INDEXED_EXTRA_CALLER_OPS) +#define dout_context g_ceph_context + class CephContext; struct PGLog : DoutPrefixProvider { @@ -558,8 +560,8 @@ public: PGLog(CephContext *cct, DoutPrefixProvider *dpp = 0) : prefix_provider(dpp), dirty_from(eversion_t::max()), - writeout_from(eversion_t::max()), - cct(cct), + writeout_from(eversion_t::max()), + cct(cct), pg_log_debug(!(cct && !(cct->_conf->osd_debug_pg_log_writeout))), touched_log(false), clear_divergent_priors(false) {} @@ -1308,5 +1310,7 @@ public: ldpp_dout(dpp, 10) << "read_log_and_missing done" << dendl; } }; - + +#undef dout_context + #endif // CEPH_PG_LOG_H diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 71e3706306b2..f16f85a803fd 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab /* * Ceph - scalable distributed file system @@ -10,9 +10,9 @@ * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software + * License version 2.1, as published by the Free Software * Foundation. See file COPYING. - * + * */ #include "boost/tuple/tuple.hpp" @@ -55,6 +55,7 @@ #define tracepoint(...) #endif +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #define DOUT_PREFIX_ARGS this, osd->whoami, get_osdmap() #undef dout_prefix diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 81c0c99365bc..94d8951ef267 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -22,6 +22,7 @@ #include "messages/MOSDPGPull.h" #include "messages/MOSDPGPushReply.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #define DOUT_PREFIX_ARGS this #undef dout_prefix diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc index 20f808aba80c..deceaf7ccc00 100644 --- a/src/osd/SnapMapper.cc +++ b/src/osd/SnapMapper.cc @@ -14,6 +14,7 @@ #include "SnapMapper.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix *_dout << "snap_mapper." diff --git a/src/osd/Watch.cc b/src/osd/Watch.cc index 4090d1c56492..0ec5edda3f1a 100644 --- a/src/osd/Watch.cc +++ b/src/osd/Watch.cc @@ -16,6 +16,7 @@ struct CancelableContext : public Context { virtual void cancel() = 0; }; +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix _prefix(_dout, this) diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc index 5a329e2ceb3d..e35f6b1da245 100644 --- a/src/perfglue/heap_profiler.cc +++ b/src/perfglue/heap_profiler.cc @@ -26,6 +26,8 @@ #include "global/global_context.h" #include "common/debug.h" +#define dout_context g_ceph_context + bool ceph_using_tcmalloc() { return true; diff --git a/src/rbd_replay/PendingIO.cc b/src/rbd_replay/PendingIO.cc index bbf0a204c210..bdf93c974f33 100644 --- a/src/rbd_replay/PendingIO.cc +++ b/src/rbd_replay/PendingIO.cc @@ -15,6 +15,7 @@ #include "PendingIO.hpp" #include "rbd_replay_debug.hpp" +#define dout_context g_ceph_context using namespace std; using namespace rbd_replay; diff --git a/src/rbd_replay/Replayer.cc b/src/rbd_replay/Replayer.cc index ea0f9a08f7e9..3d57b0ad9459 100644 --- a/src/rbd_replay/Replayer.cc +++ b/src/rbd_replay/Replayer.cc @@ -23,6 +23,7 @@ #include "global/global_context.h" #include "rbd_replay_debug.hpp" +#define dout_context g_ceph_context using namespace std; using namespace rbd_replay; diff --git a/src/rbd_replay/actions.cc b/src/rbd_replay/actions.cc index e596ec0dd50d..ffb996dc0a77 100644 --- a/src/rbd_replay/actions.cc +++ b/src/rbd_replay/actions.cc @@ -18,6 +18,7 @@ #include "PendingIO.hpp" #include "rbd_replay_debug.hpp" +#define dout_context g_ceph_context using namespace rbd_replay; using namespace std; diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 36c8033a8d3d..6e0753da2e19 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -42,6 +42,7 @@ using namespace std; +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw #define SECRET_KEY_LEN 40 diff --git a/src/rgw/rgw_asio_client.cc b/src/rgw/rgw_asio_client.cc index 282281a4142e..219a36b68374 100644 --- a/src/rgw/rgw_asio_client.cc +++ b/src/rgw/rgw_asio_client.cc @@ -6,6 +6,7 @@ #include "rgw_asio_client.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw #undef dout_prefix diff --git a/src/rgw/rgw_auth.cc b/src/rgw/rgw_auth.cc index 67ce77d89a1d..fb623d6cca6a 100644 --- a/src/rgw/rgw_auth.cc +++ b/src/rgw/rgw_auth.cc @@ -11,6 +11,7 @@ #include "include/str_list.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc index 69dc01d976bc..501dbeb356ba 100644 --- a/src/rgw/rgw_auth_s3.cc +++ b/src/rgw/rgw_auth_s3.cc @@ -7,6 +7,7 @@ #include "rgw_client_io.h" #include "rgw_rest.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw static const char *signed_subresources[] = { diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index c375f2dcf319..3a58e6874abe 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -25,6 +25,7 @@ #include "cls/user/cls_user_types.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw #define BUCKET_TAG_TIMEOUT 30 diff --git a/src/rgw/rgw_civetweb_log.cc b/src/rgw/rgw_civetweb_log.cc index e2d8dd9ad015..a01094d5c976 100644 --- a/src/rgw/rgw_civetweb_log.cc +++ b/src/rgw/rgw_civetweb_log.cc @@ -6,6 +6,7 @@ #define dout_subsys ceph_subsys_civetweb +#define dout_context g_ceph_context int rgw_civetweb_log_callback(const struct mg_connection *conn, const char *buf) { dout(0) << "civetweb: " << (void *)conn << ": " << buf << dendl; return 0; diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index c4e34a344d76..b723f5422b93 100644 --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@ -23,6 +23,7 @@ #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw PerfCounters *perfcounter = NULL; diff --git a/src/rgw/rgw_cors.cc b/src/rgw/rgw_cors.cc index f2c7f3ac6442..3081dc00d64b 100644 --- a/src/rgw/rgw_cors.cc +++ b/src/rgw/rgw_cors.cc @@ -1,4 +1,4 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab /* * Ceph - scalable distributed file system @@ -16,7 +16,7 @@ #include #include -#include +#include #include "include/types.h" #include "common/debug.h" @@ -25,6 +25,7 @@ #include "rgw_cors.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw using namespace std; diff --git a/src/rgw/rgw_cors_s3.cc b/src/rgw/rgw_cors_s3.cc index f00c65eb4289..162217909e26 100644 --- a/src/rgw/rgw_cors_s3.cc +++ b/src/rgw/rgw_cors_s3.cc @@ -22,6 +22,7 @@ #include "rgw_cors_s3.h" #include "rgw_user.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw using namespace std; diff --git a/src/rgw/rgw_cr_rados.cc b/src/rgw/rgw_cr_rados.cc index 0bfc1eda840c..c5e04b47ab8f 100644 --- a/src/rgw/rgw_cr_rados.cc +++ b/src/rgw/rgw_cr_rados.cc @@ -5,6 +5,7 @@ #include "cls/lock/cls_lock_client.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw bool RGWAsyncRadosProcessor::RGWWQ::_enqueue(RGWAsyncRadosRequest *req) { diff --git a/src/rgw/rgw_env.cc b/src/rgw/rgw_env.cc index 63fce5185c50..00940670ae36 100644 --- a/src/rgw/rgw_env.cc +++ b/src/rgw/rgw_env.cc @@ -6,9 +6,9 @@ #include #include - #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw void RGWEnv::init(CephContext *cct) diff --git a/src/rgw/rgw_frontend.cc b/src/rgw/rgw_frontend.cc index 24e186e2d467..a047bcd37801 100644 --- a/src/rgw/rgw_frontend.cc +++ b/src/rgw/rgw_frontend.cc @@ -9,6 +9,7 @@ #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw int RGWFrontendConfig::parse_config(const string& config, diff --git a/src/rgw/rgw_frontend.h b/src/rgw/rgw_frontend.h index 2ae281f72bf1..f42629a08ccf 100644 --- a/src/rgw/rgw_frontend.h +++ b/src/rgw/rgw_frontend.h @@ -15,6 +15,7 @@ #include "rgw_civetweb_log.h" #include "civetweb/civetweb.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw class RGWFrontendConfig { diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc index a5f5d395055b..c9251141f2ee 100644 --- a/src/rgw/rgw_gc.cc +++ b/src/rgw/rgw_gc.cc @@ -10,6 +10,7 @@ #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw using namespace std; diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc index 076846c3082b..18de1a9b617f 100644 --- a/src/rgw/rgw_http_client.cc +++ b/src/rgw/rgw_http_client.cc @@ -16,6 +16,7 @@ #include "rgw_coroutine.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw struct rgw_http_req_data : public RefCountedObject { diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc index ca4b1e372037..33a0a2822826 100644 --- a/src/rgw/rgw_json_enc.cc +++ b/src/rgw/rgw_json_enc.cc @@ -17,6 +17,7 @@ #include "common/ceph_json.h" #include "common/Formatter.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw void encode_json(const char *name, const obj_version& v, Formatter *f) diff --git a/src/rgw/rgw_keystone.cc b/src/rgw/rgw_keystone.cc index 4d2fc8111340..9e98ec537a46 100644 --- a/src/rgw/rgw_keystone.cc +++ b/src/rgw/rgw_keystone.cc @@ -15,6 +15,7 @@ #include "common/armor.h" #include "common/Cond.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw int rgw_open_cms_envelope(CephContext * const cct, diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc index 4821b1888ee3..0aa1a23d3864 100644 --- a/src/rgw/rgw_lc.cc +++ b/src/rgw/rgw_lc.cc @@ -18,7 +18,7 @@ #include "rgw_lc_s3.h" - +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw const char* LC_STATUS[] = { diff --git a/src/rgw/rgw_object_expirer_core.cc b/src/rgw/rgw_object_expirer_core.cc index 9bbd0095112a..3bc033f0a688 100644 --- a/src/rgw/rgw_object_expirer_core.cc +++ b/src/rgw/rgw_object_expirer_core.cc @@ -35,6 +35,7 @@ using namespace std; #include "cls/lock/cls_lock_client.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw static string objexp_lock_name = "gc_process"; diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index fd10cfcb7397..29a272184ebc 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -42,6 +42,7 @@ #include "compressor/Compressor.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw using namespace std; diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc index 99001f2f71d5..de5d97ae3ddd 100644 --- a/src/rgw/rgw_policy_s3.cc +++ b/src/rgw/rgw_policy_s3.cc @@ -8,6 +8,7 @@ #include "rgw_common.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw class RGWPolicyCondition { diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h index d3f1d2db25a9..6c59c9c762a2 100644 --- a/src/rgw/rgw_process.h +++ b/src/rgw/rgw_process.h @@ -21,6 +21,7 @@ #define def_dout_subsys #endif +#define dout_context g_ceph_context extern void signal_shutdown(); @@ -198,5 +199,6 @@ extern int rgw_process_authenticated(RGWHandler_REST* handler, #undef def_dout_subsys #undef dout_subsys #endif +#undef dout_context #endif /* RGW_PROCESS_H */ diff --git a/src/rgw/rgw_quota.cc b/src/rgw/rgw_quota.cc index f1062121788f..c364c27cbcae 100644 --- a/src/rgw/rgw_quota.cc +++ b/src/rgw/rgw_quota.cc @@ -26,6 +26,7 @@ #include "rgw_bucket.h" #include "rgw_user.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 33c4b2dbdd64..5ab827d73783 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -73,6 +73,7 @@ using namespace librados; #include "compressor/Compressor.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw using namespace std; diff --git a/src/rgw/rgw_request.cc b/src/rgw/rgw_request.cc index e51b3d7e36be..dcad1993e25e 100644 --- a/src/rgw/rgw_request.cc +++ b/src/rgw/rgw_request.cc @@ -4,6 +4,7 @@ #include "rgw_op.h" #include "rgw_request.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw /* XXX */ diff --git a/src/rgw/rgw_rest_client.cc b/src/rgw/rgw_rest_client.cc index 1fe03c6fd153..f02b17a97a56 100644 --- a/src/rgw/rgw_rest_client.cc +++ b/src/rgw/rgw_rest_client.cc @@ -12,6 +12,7 @@ #include "common/strtol.h" #include "include/str_list.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw int RGWRESTSimpleRequest::get_status() diff --git a/src/rgw/rgw_rest_config.cc b/src/rgw/rgw_rest_config.cc index 2c0f5e46e9c2..645d4b855fe0 100644 --- a/src/rgw/rgw_rest_config.cc +++ b/src/rgw/rgw_rest_config.cc @@ -22,6 +22,7 @@ #include "common/errno.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw void RGWOp_ZoneGroupMap_Get::execute() { diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc index 478a5cac08a2..cb720ba1f852 100644 --- a/src/rgw/rgw_rest_log.cc +++ b/src/rgw/rgw_rest_log.cc @@ -23,6 +23,7 @@ #include "common/errno.h" #include "include/assert.h" +#define dout_context g_ceph_context #define LOG_CLASS_LIST_MAX_ENTRIES (1000) #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_metadata.cc b/src/rgw/rgw_rest_metadata.cc index 202a8b20f0a9..272e304f17eb 100644 --- a/src/rgw/rgw_rest_metadata.cc +++ b/src/rgw/rgw_rest_metadata.cc @@ -22,6 +22,7 @@ #include "common/strtol.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw const string RGWOp_Metadata_Get::name() { diff --git a/src/rgw/rgw_rest_opstate.cc b/src/rgw/rgw_rest_opstate.cc index 02bdf17065a4..af9c024e13f7 100644 --- a/src/rgw/rgw_rest_opstate.cc +++ b/src/rgw/rgw_rest_opstate.cc @@ -21,6 +21,7 @@ #include "common/errno.h" #include "include/assert.h" +#define dout_context g_ceph_context #define OPSTATE_LIST_MAX_ENTRIES 1000 #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_replica_log.cc b/src/rgw/rgw_rest_replica_log.cc index 4768284c289d..919815f57236 100644 --- a/src/rgw/rgw_rest_replica_log.cc +++ b/src/rgw/rgw_rest_replica_log.cc @@ -24,6 +24,7 @@ #include "common/errno.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw #define REPLICA_INPUT_MAX_LEN (512*1024) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 63b100e19a69..86a587796051 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -33,6 +33,7 @@ #include "rgw_token.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw using namespace rgw; diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index 2a02c8ac8789..5bc9b920e78f 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -31,6 +31,7 @@ #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw int RGWListBuckets_ObjStore_SWIFT::get_params() diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc index 5b8cec9c0264..50fdf8e2ea61 100644 --- a/src/rgw/rgw_swift_auth.cc +++ b/src/rgw/rgw_swift_auth.cc @@ -18,6 +18,7 @@ #include "rgw_http_client.h" #include "include/str_list.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw #define DEFAULT_SWIFT_PREFIX "/swift" diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc index 029d257dc843..359cde08a8c4 100644 --- a/src/test/TestSignalHandlers.cc +++ b/src/test/TestSignalHandlers.cc @@ -28,6 +28,7 @@ #include #include +#define dout_context g_ceph_context using std::string; // avoid compiler warning about dereferencing NULL pointer diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc index 0caa06c82a6b..ca8f2f3e0644 100644 --- a/src/test/bench_log.cc +++ b/src/test/bench_log.cc @@ -9,6 +9,8 @@ #include "common/ceph_argparse.h" #include "global/global_init.h" +#define dout_context g_ceph_context + struct T : public Thread { int num; set myset; diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc index 005c576bc8bd..ecd2f4978b11 100644 --- a/src/test/librados_test_stub/LibradosTestStub.cc +++ b/src/test/librados_test_stub/LibradosTestStub.cc @@ -24,6 +24,7 @@ #include "include/assert.h" #include "include/compat.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rados namespace { diff --git a/src/test/librados_test_stub/TestClassHandler.cc b/src/test/librados_test_stub/TestClassHandler.cc index 1305b7b06bde..35d905aa3d62 100644 --- a/src/test/librados_test_stub/TestClassHandler.cc +++ b/src/test/librados_test_stub/TestClassHandler.cc @@ -11,6 +11,7 @@ #include "common/debug.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rados namespace librados { diff --git a/src/test/librbd/test_mock_Journal.cc b/src/test/librbd/test_mock_Journal.cc index ced44da91efc..1745bc60452c 100644 --- a/src/test/librbd/test_mock_Journal.cc +++ b/src/test/librbd/test_mock_Journal.cc @@ -1,4 +1,4 @@ -// -*- mode:C; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab #include "test/librbd/test_mock_fixture.h" @@ -26,6 +26,7 @@ #include #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd namespace librbd { diff --git a/src/test/librgw_file_aw.cc b/src/test/librgw_file_aw.cc index 9e03d4095972..14adc3f831c7 100644 --- a/src/test/librgw_file_aw.cc +++ b/src/test/librgw_file_aw.cc @@ -28,6 +28,7 @@ #include "common/debug.h" #include "global/global_init.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw namespace { diff --git a/src/test/librgw_file_gp.cc b/src/test/librgw_file_gp.cc index eba0e386ca31..a8f1abd4ac34 100644 --- a/src/test/librgw_file_gp.cc +++ b/src/test/librgw_file_gp.cc @@ -28,6 +28,7 @@ #include "common/debug.h" #include "global/global_init.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw namespace { diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc index 9a5558dc2f1b..0c5f7011521a 100644 --- a/src/test/mon/test-mon-msg.cc +++ b/src/test/mon/test-mon-msg.cc @@ -42,6 +42,7 @@ #include "messages/MGenericMessage.h" #include "messages/MMonJoin.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_ #undef dout_prefix #define dout_prefix *_dout << "test-mon-msg " diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 0da95b368f10..9bb28ef8b99f 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -63,6 +63,7 @@ using namespace std; +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_ #undef dout_prefix #define dout_prefix _prefix(_dout, get_name()) diff --git a/src/test/objectstore/DeterministicOpSequence.cc b/src/test/objectstore/DeterministicOpSequence.cc index 4fd6822052ac..772715eb4ccb 100644 --- a/src/test/objectstore/DeterministicOpSequence.cc +++ b/src/test/objectstore/DeterministicOpSequence.cc @@ -29,6 +29,7 @@ #include "common/config.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "deterministic_seq " diff --git a/src/test/objectstore/FileStoreDiff.cc b/src/test/objectstore/FileStoreDiff.cc index 6a08e9c37c8d..2596166546bd 100644 --- a/src/test/objectstore/FileStoreDiff.cc +++ b/src/test/objectstore/FileStoreDiff.cc @@ -20,6 +20,7 @@ #include "FileStoreDiff.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "filestore_diff " diff --git a/src/test/objectstore/TestObjectStoreState.cc b/src/test/objectstore/TestObjectStoreState.cc index 873c68afd7f4..9a4f6e1be949 100644 --- a/src/test/objectstore/TestObjectStoreState.cc +++ b/src/test/objectstore/TestObjectStoreState.cc @@ -25,6 +25,7 @@ #include "TestObjectStoreState.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "ceph_test_objectstore_state " diff --git a/src/test/objectstore/test_idempotent_sequence.cc b/src/test/objectstore/test_idempotent_sequence.cc index 0216b78f3347..9d49e4d2e488 100644 --- a/src/test/objectstore/test_idempotent_sequence.cc +++ b/src/test/objectstore/test_idempotent_sequence.cc @@ -27,6 +27,7 @@ #include "common/config.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_ #undef dout_prefix #define dout_prefix *_dout << "test_idempotent_sequence " diff --git a/src/test/objectstore/test_memstore_clone.cc b/src/test/objectstore/test_memstore_clone.cc index 26c0f9f2557e..aa5374790ca2 100644 --- a/src/test/objectstore/test_memstore_clone.cc +++ b/src/test/objectstore/test_memstore_clone.cc @@ -20,6 +20,8 @@ #include "common/errno.h" #include "store_test_fixture.h" +#define dout_context g_ceph_context + namespace { const coll_t cid; diff --git a/src/test/objectstore/workload_generator.cc b/src/test/objectstore/workload_generator.cc index 5b0d1c1e84fd..b5e6dde149a0 100644 --- a/src/test/objectstore/workload_generator.cc +++ b/src/test/objectstore/workload_generator.cc @@ -31,6 +31,8 @@ #include "TestObjectStoreState.h" +#define dout_context g_ceph_context + static const char *our_name = NULL; void usage(); diff --git a/src/test/objectstore_bench.cc b/src/test/objectstore_bench.cc index 72c43a48ca3e..484fe8ec8df9 100644 --- a/src/test/objectstore_bench.cc +++ b/src/test/objectstore_bench.cc @@ -15,6 +15,7 @@ #include "common/strtol.h" #include "common/ceph_argparse.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore static void usage() diff --git a/src/test/osdc/MemWriteback.cc b/src/test/osdc/MemWriteback.cc index 17f560176a00..ddcf3ef109f1 100644 --- a/src/test/osdc/MemWriteback.cc +++ b/src/test/osdc/MemWriteback.cc @@ -14,6 +14,7 @@ #include "MemWriteback.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_objectcacher #undef dout_prefix #define dout_prefix *_dout << "MemWriteback(" << this << ") " diff --git a/src/test/rbd_mirror/random_write.cc b/src/test/rbd_mirror/random_write.cc index deed9ec21a54..c25f473c6fd9 100644 --- a/src/test/rbd_mirror/random_write.cc +++ b/src/test/rbd_mirror/random_write.cc @@ -12,6 +12,7 @@ #include #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "random-write: " diff --git a/src/test/signals.cc b/src/test/signals.cc index a66b75eb24c4..afcfbb7d645f 100644 --- a/src/test/signals.cc +++ b/src/test/signals.cc @@ -12,6 +12,7 @@ #include "include/assert.h" +#define dout_context g_ceph_context static volatile sig_atomic_t got_sigusr1 = 0; static void handle_sigusr1(int signo) diff --git a/src/test/test_trans.cc b/src/test/test_trans.cc index e53870bd8f39..691b3cb0b794 100644 --- a/src/test/test_trans.cc +++ b/src/test/test_trans.cc @@ -19,6 +19,7 @@ #include "global/global_init.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout diff --git a/src/test/testcrypto.cc b/src/test/testcrypto.cc index c91fb1413a60..80f5fe36d247 100644 --- a/src/test/testcrypto.cc +++ b/src/test/testcrypto.cc @@ -8,6 +8,8 @@ #define AES_KEY_LEN 16 +#define dout_context g_ceph_context + int main(int argc, char *argv[]) { char aes_key[AES_KEY_LEN]; diff --git a/src/test/testkeys.cc b/src/test/testkeys.cc index 8892942bd532..45b897b68fe8 100644 --- a/src/test/testkeys.cc +++ b/src/test/testkeys.cc @@ -4,6 +4,8 @@ #include "common/config.h" #include "common/debug.h" +#define dout_context g_ceph_context + #define AES_KEY_LEN 16 int main(int argc, const char **argv) diff --git a/src/tools/ceph-client-debug.cc b/src/tools/ceph-client-debug.cc index a6ab88d84f69..2984db678cf0 100644 --- a/src/tools/ceph-client-debug.cc +++ b/src/tools/ceph-client-debug.cc @@ -23,6 +23,7 @@ #include "client/Dir.h" #include "include/cephfs/libcephfs.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_client void usage() diff --git a/src/tools/cephfs/DataScan.cc b/src/tools/cephfs/DataScan.cc index 7ff86ef3c202..2bd70406715b 100644 --- a/src/tools/cephfs/DataScan.cc +++ b/src/tools/cephfs/DataScan.cc @@ -24,6 +24,7 @@ #include "DataScan.h" #include "include/compat.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "datascan." << __func__ << ": " diff --git a/src/tools/cephfs/Dumper.cc b/src/tools/cephfs/Dumper.cc index c2cd44a3ccf9..f50bedcab362 100644 --- a/src/tools/cephfs/Dumper.cc +++ b/src/tools/cephfs/Dumper.cc @@ -28,6 +28,7 @@ #include "Dumper.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #define HEADER_LEN 4096 diff --git a/src/tools/cephfs/JournalFilter.cc b/src/tools/cephfs/JournalFilter.cc index aefbb2f67793..6db9f4b07466 100644 --- a/src/tools/cephfs/JournalFilter.cc +++ b/src/tools/cephfs/JournalFilter.cc @@ -19,6 +19,7 @@ #include "mds/events/ESession.h" #include "mds/events/EUpdate.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/tools/cephfs/JournalScanner.cc b/src/tools/cephfs/JournalScanner.cc index 7df93900f0b7..2b88231ca81a 100644 --- a/src/tools/cephfs/JournalScanner.cc +++ b/src/tools/cephfs/JournalScanner.cc @@ -19,6 +19,7 @@ #include "JournalScanner.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds /** diff --git a/src/tools/cephfs/JournalTool.cc b/src/tools/cephfs/JournalTool.cc index 5176eeabbb08..f47ff6be5960 100644 --- a/src/tools/cephfs/JournalTool.cc +++ b/src/tools/cephfs/JournalTool.cc @@ -32,6 +32,7 @@ #include "JournalTool.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << __func__ << ": " diff --git a/src/tools/cephfs/MDSUtility.cc b/src/tools/cephfs/MDSUtility.cc index e51ffd5ca50b..6ee89e8c86b2 100644 --- a/src/tools/cephfs/MDSUtility.cc +++ b/src/tools/cephfs/MDSUtility.cc @@ -14,6 +14,7 @@ #include "MDSUtility.h" #include "mon/MonClient.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds diff --git a/src/tools/cephfs/PgFiles.cc b/src/tools/cephfs/PgFiles.cc index c027eafca75c..0c0436419b8a 100644 --- a/src/tools/cephfs/PgFiles.cc +++ b/src/tools/cephfs/PgFiles.cc @@ -18,6 +18,7 @@ #include "PgFiles.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "pgeffects." << __func__ << ": " diff --git a/src/tools/cephfs/Resetter.cc b/src/tools/cephfs/Resetter.cc index 16b0cea9ce78..2ef02c5d31f2 100644 --- a/src/tools/cephfs/Resetter.cc +++ b/src/tools/cephfs/Resetter.cc @@ -23,6 +23,7 @@ #include "Resetter.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds int Resetter::reset(mds_role_t role) diff --git a/src/tools/cephfs/TableTool.cc b/src/tools/cephfs/TableTool.cc index 1cb8299a0c10..42aa7d29034c 100644 --- a/src/tools/cephfs/TableTool.cc +++ b/src/tools/cephfs/TableTool.cc @@ -22,6 +22,7 @@ #include "TableTool.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << __func__ << ": " diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc index fd915c747444..201147392d18 100644 --- a/src/tools/crushtool.cc +++ b/src/tools/crushtool.cc @@ -36,6 +36,7 @@ #include "crush/CrushTester.h" #include "include/assert.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_crush using namespace std; diff --git a/src/tools/rados/PoolDump.cc b/src/tools/rados/PoolDump.cc index 5d0b3eda6d84..ad7a1a4dfefb 100644 --- a/src/tools/rados/PoolDump.cc +++ b/src/tools/rados/PoolDump.cc @@ -19,6 +19,7 @@ using namespace librados; +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rados /** diff --git a/src/tools/rados/RadosImport.cc b/src/tools/rados/RadosImport.cc index 4f72142d6576..0f27e1c6db70 100644 --- a/src/tools/rados/RadosImport.cc +++ b/src/tools/rados/RadosImport.cc @@ -18,6 +18,7 @@ #include "osd/PGLog.h" #include "RadosImport.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rados int RadosImport::import(std::string pool, bool no_overwrite) diff --git a/src/tools/rbd/action/ImportDiff.cc b/src/tools/rbd/action/ImportDiff.cc index 2efdc65833b5..76691ea2d706 100644 --- a/src/tools/rbd/action/ImportDiff.cc +++ b/src/tools/rbd/action/ImportDiff.cc @@ -12,6 +12,7 @@ #include #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd namespace rbd { diff --git a/src/tools/rbd/action/MergeDiff.cc b/src/tools/rbd/action/MergeDiff.cc index 85627b318bd2..cdb593887b89 100644 --- a/src/tools/rbd/action/MergeDiff.cc +++ b/src/tools/rbd/action/MergeDiff.cc @@ -15,6 +15,7 @@ #include #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd namespace rbd { diff --git a/src/tools/rbd_mirror/ClusterWatcher.cc b/src/tools/rbd_mirror/ClusterWatcher.cc index 516e1e3deef9..87b6f8ee52fd 100644 --- a/src/tools/rbd_mirror/ClusterWatcher.cc +++ b/src/tools/rbd_mirror/ClusterWatcher.cc @@ -8,6 +8,7 @@ #include "ClusterWatcher.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::ClusterWatcher:" << this << " " \ diff --git a/src/tools/rbd_mirror/ImageDeleter.cc b/src/tools/rbd_mirror/ImageDeleter.cc index d879368e3c2c..773ad493b004 100644 --- a/src/tools/rbd_mirror/ImageDeleter.cc +++ b/src/tools/rbd_mirror/ImageDeleter.cc @@ -34,6 +34,7 @@ #include "librbd/Utils.h" #include "ImageDeleter.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::ImageDeleter: " << this << " " \ diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index ff2fa32623ba..b08a220611f6 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -28,6 +28,7 @@ #include "tools/rbd_mirror/image_replayer/EventPreprocessor.h" #include "tools/rbd_mirror/image_replayer/ReplayStatusFormatter.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::" << *this << " " \ diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc index 1f55a039d7ae..e19ed5637949 100644 --- a/src/tools/rbd_mirror/ImageSync.cc +++ b/src/tools/rbd_mirror/ImageSync.cc @@ -14,6 +14,7 @@ #include "tools/rbd_mirror/image_sync/SyncPointCreateRequest.h" #include "tools/rbd_mirror/image_sync/SyncPointPruneRequest.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::ImageSync: " \ diff --git a/src/tools/rbd_mirror/ImageSyncThrottler.cc b/src/tools/rbd_mirror/ImageSyncThrottler.cc index dc03589b3874..f77a5c46b228 100644 --- a/src/tools/rbd_mirror/ImageSyncThrottler.cc +++ b/src/tools/rbd_mirror/ImageSyncThrottler.cc @@ -16,6 +16,7 @@ #include "ImageSync.h" #include "common/ceph_context.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::ImageSyncThrottler:: " << this \ diff --git a/src/tools/rbd_mirror/Mirror.cc b/src/tools/rbd_mirror/Mirror.cc index 0463a81d139d..e14f10c3d4de 100644 --- a/src/tools/rbd_mirror/Mirror.cc +++ b/src/tools/rbd_mirror/Mirror.cc @@ -11,6 +11,7 @@ #include "Threads.h" #include "ImageSync.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::Mirror: " << this << " " \ diff --git a/src/tools/rbd_mirror/PoolWatcher.cc b/src/tools/rbd_mirror/PoolWatcher.cc index 3e431f22ee11..360e00dd48a9 100644 --- a/src/tools/rbd_mirror/PoolWatcher.cc +++ b/src/tools/rbd_mirror/PoolWatcher.cc @@ -12,6 +12,7 @@ #include "PoolWatcher.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::PoolWatcher: " << this << " " \ diff --git a/src/tools/rbd_mirror/Replayer.cc b/src/tools/rbd_mirror/Replayer.cc index 6c70c9b78dff..930bd13749ce 100644 --- a/src/tools/rbd_mirror/Replayer.cc +++ b/src/tools/rbd_mirror/Replayer.cc @@ -18,6 +18,7 @@ #include "Replayer.h" #include "Threads.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::Replayer: " \ diff --git a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc index 20ddf90da613..af0845989ef1 100644 --- a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc @@ -23,6 +23,7 @@ #include "tools/rbd_mirror/ProgressContext.h" #include "tools/rbd_mirror/ImageSyncThrottler.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_replayer::BootstrapRequest: " \ diff --git a/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc index 247c6299c68d..d7ea6085edbe 100644 --- a/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc @@ -9,6 +9,7 @@ #include "librbd/ImageState.h" #include "librbd/Utils.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_replayer::CloseImageRequest: " \ diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc index 27c6c1ca2bde..96c726a62065 100644 --- a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc @@ -14,6 +14,7 @@ #include "librbd/Utils.h" #include "librbd/image/CreateRequest.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_replayer::CreateImageRequest: " \ diff --git a/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc b/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc index acb3600b60cf..5aaf352e8630 100644 --- a/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc +++ b/src/tools/rbd_mirror/image_replayer/EventPreprocessor.cc @@ -13,6 +13,7 @@ #include "librbd/journal/Types.h" #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix diff --git a/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc index 9cf6af2b3219..c908d0977666 100644 --- a/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc @@ -10,6 +10,7 @@ #include "librbd/Utils.h" #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_replayer::OpenImageRequest: " \ diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc index 588e64ec35a6..ff1493ddfd42 100644 --- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc @@ -15,6 +15,7 @@ #include "librbd/journal/Policy.h" #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_replayer::OpenLocalImageRequest: " \ diff --git a/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc b/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc index 917a706594a0..faca72b47d43 100644 --- a/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc +++ b/src/tools/rbd_mirror/image_replayer/ReplayStatusFormatter.cc @@ -10,6 +10,7 @@ #include "librbd/Journal.h" #include "librbd/Utils.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_replayer::ReplayStatusFormatter: " \ diff --git a/src/tools/rbd_mirror/image_sync/ImageCopyRequest.cc b/src/tools/rbd_mirror/image_sync/ImageCopyRequest.cc index 336f114c41e4..734ed829f77c 100644 --- a/src/tools/rbd_mirror/image_sync/ImageCopyRequest.cc +++ b/src/tools/rbd_mirror/image_sync/ImageCopyRequest.cc @@ -10,6 +10,7 @@ #include "librbd/Utils.h" #include "tools/rbd_mirror/ProgressContext.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_sync::ImageCopyRequest: " \ diff --git a/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc b/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc index df607e2ad20b..bfafb515a185 100644 --- a/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc +++ b/src/tools/rbd_mirror/image_sync/ObjectCopyRequest.cc @@ -7,6 +7,7 @@ #include "librbd/Utils.h" #include "common/errno.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_sync::ObjectCopyRequest: " \ diff --git a/src/tools/rbd_mirror/image_sync/SnapshotCopyRequest.cc b/src/tools/rbd_mirror/image_sync/SnapshotCopyRequest.cc index 974dfb720b7c..028af8bb3467 100644 --- a/src/tools/rbd_mirror/image_sync/SnapshotCopyRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SnapshotCopyRequest.cc @@ -10,6 +10,7 @@ #include "librbd/Utils.h" #include "librbd/journal/Types.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_sync::SnapshotCopyRequest: " \ diff --git a/src/tools/rbd_mirror/image_sync/SnapshotCreateRequest.cc b/src/tools/rbd_mirror/image_sync/SnapshotCreateRequest.cc index 28f95dc4ff87..3f8657063fda 100644 --- a/src/tools/rbd_mirror/image_sync/SnapshotCreateRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SnapshotCreateRequest.cc @@ -10,6 +10,7 @@ #include "librbd/Utils.h" #include "osdc/Striper.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_sync::SnapshotCreateRequest: " \ diff --git a/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc index 52cf040b1d0c..5fd0e948572b 100644 --- a/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc @@ -10,6 +10,7 @@ #include "librbd/Operations.h" #include "librbd/Utils.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_sync::SyncPointCreateRequest: " \ diff --git a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc index 8341fbe06e45..9e21bf790750 100644 --- a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc @@ -10,6 +10,7 @@ #include "librbd/Utils.h" #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd_mirror #undef dout_prefix #define dout_prefix *_dout << "rbd::mirror::image_sync::SyncPointPruneRequest: " \ diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index 04a747cbf9a6..526bd5120f0c 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -51,6 +51,7 @@ #include "include/rbd/librbd.hpp" #include "include/xlist.h" +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rbd #undef dout_prefix #define dout_prefix *_dout << "rbd-nbd: "