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 <aemerson@redhat.com>

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 06a1e4150040f8fbacb6e204b4821c4cafb842f9..f3ec612157996c50c0f22c42dd572c44bd873df5 100644 (file)
--- 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 <sys/stat.h>
@@ -37,12 +37,14 @@ using namespace std;
 #include "global/signal_handler.h"
 #include "common/Preforker.h"
 #include "common/safe_io.h"
-       
+
 #include <sys/types.h>
 #include <fcntl.h>
 
 #include <fuse.h>
 
+#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 5f8173e724e0e2e39f6d88e0d58d50b179c1027e..a444d573975ab4ff5a59a7bd9d6ad3cf31f424ce 100644 (file)
--- 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 db1e4a9a143c628fe0592a6f9915ccd95f2a27d8..31c0e637c8ddbdeb990f06d981b24e1c60a11de3 100644 (file)
--- 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 9fab5214c4d41d5a2cfa152092cb4d109aaefff5..73024ff4842ebc2330ae61b1197616ae52118e07 100644 (file)
--- 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 a0b9e06388deec605e400186456fbda55fcb8034..1fdd3289a938189b30d34f6d578c137a8c93adc1 100644 (file)
--- 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 <sys/file.h>
@@ -38,6 +38,8 @@
 #include <fuse.h>
 #include <fuse_lowlevel.h>
 
+#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 030b9a2231989cad4a08258f0c1cecb773ff69ad..00f66c7cefae087194ebf9c5066f56e4b623b155 100644 (file)
--- 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<string> &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 1f4f8c66a09aeb81705deab275c2616afcd96307..3a3e88aa640ea645c0771bf7dcb407db3ed16ab4 100644 (file)
--- 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 45338588be3763f41ba4ac61826e854998cb73b9..beb2f195d40c2453390051c2e77fe9c6f3aab16f 100644 (file)
--- a/src/compressor/zlib/ZlibCompressor.cc
+++ b/src/compressor/zlib/ZlibCompressor.cc
@@ -22,6 +22,7 @@
 #include <zlib.h>
 
 // -----------------------------------------------------------------------------
+#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 acf63d86f43c881ea82a24ebf6325e611a73867c..0d69e8cb7bb694bc9875e57bd2abe722283d9662 100644 (file)
--- 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 fa834ab9f8efeb1667f2a15c8fe43c3c50e143ce..951f7d083083c6e08f339d171eea222abff11284 100644 (file)
--- 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 408f51f52e3ed38afe53770096da944ae8247cd7..1d411b9c247e426cc64e6e2ddd76caab4f8863ee 100644 (file)
--- 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 3ccedb9699db444de6e696cd7ee817cb42a075f2..ac6923e33665d240518075d1ac7c7354b3f31e17 100644 (file)
--- 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 d05c6ceab7fff1a04c2a646053ca234407005ca8..4c8c0e49dbef06cd3a19052b0849787f17ac897a 100644 (file)
--- 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 2a17ef831989088f0c54248b2dd34d91e922e997..a60fa6e0861532329381c963a297a7a1b853a4c6 100644 (file)
--- 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 b55be77392969696043b48c2f9548d3230173023..ded31692f50f5db596031008d792041a389d54b0 100644 (file)
--- 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 e580969a37d9d21e6ddf7df89ac52b9ecf04a958..139b7b9e80420a3d0dbdd0404e7f9128bf64fb81 100644 (file)
--- 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 ebd32db0ae5bd24c626e72b3254f320c673b9f66..6f0c1d83c8a15230766335f74aef20dd8eb49483 100644 (file)
--- 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 03669e914f3f7f808b8bbc95ffc44d22fc9be4c0..772140adb26bb7f153ce74610e8806a106f93d8d 100644 (file)
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -36,6 +36,7 @@
 #include <sys/prctl.h>
 #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 2f70cd02e110232e13a194c30aeea279081821dd..14e5871872a3b3996c9ceebab7a28bc6d4e917e1 100644 (file)
--- 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 01732cce4480ee40876d07fe3a9bc8926f8cc952..7d5069828c142a2d02b7d8b8c31a6ceb665751bf 100644 (file)
--- 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 9d8e1e402d5896b9c60919c1f3f5dfebbe3df168..b2793653ac423c62407cdcfaa6045f06021b61b2 100644 (file)
--- 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 7ef18fc25ecf6e2d25510b03c9977217c5e9d9bc..cd70bb81b7a9219a9d61ec4dbe024866b3be7360 100644 (file)
--- 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 41c7221902e103b884bc1d739502836349ce026c..2e339c062c553129fc92efa63b562f400c3ce649 100644 (file)
--- 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 36c7d882e099ea8be9ef59f7ecda008270fae0a2..c8a88de7170b1e322badce909db8bac8d1a287f7 100644 (file)
--- 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 c528a028f708a30b327b0faae21c3238aa24d75b..032f83a4297aa50a4ccea95f7836910aa6d3f12b 100644 (file)
--- 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 f3a7ce8592398128c6640f527e0a6063aab077a4..270abdb5071a8bdcaea833d363913b0816976168 100644 (file)
--- 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 d2239317cdb15b4df5e3df51117ebae2ffb5afcb..1e7431100ae5b6ca287e3871702a37296a390ece 100644 (file)
--- 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 3a59eb40bedf21fad206dbe529215c903a109967..d58c7d00a63939fb82c09005acfb1b1b0c072bec 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -37,6 +37,8 @@
 #include <set>
 #include <map>
 
+#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 58aa0e4ba9390fa542b15750522db1f0013b5c34..c19f4e2c93ee14eb7ff510259c3ab786f68ba168 100644 (file)
--- 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 9b6029c5e3652fa2f69617d7e65dfa294ef2674c..e21543cde1aa34e7975e5ff4181df710f3771770 100644 (file)
--- 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 d8c43aa5a9d628209fc69eba8ccaf4c9511761f8..e0ea57ce4cbb3480b3457c3893fed8fa4299e73f 100644 (file)
--- 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 f576a1a539e0886041cb139abccb2acf2ffa3495..59ab488a3c32940392f467c8023266a87ac50aad 100644 (file)
--- 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 c933261a8aa05464700b3a6bd5b612bf190488dc..90d84deaf29a218f5e25ea25468771074cc684ca 100644 (file)
--- 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 b8fd8fc48d033ec0325340cb2f13c39cf96c0856..e16c40964eb5bfb4b029acedaf34ec8c8859eaf3 100644 (file)
--- 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 5d0e6cad6b11c06a6611000cfcad4d421177e88b..919d6331089775728c635e7b0bb8c464ce13d630 100644 (file)
--- 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 267da464d22c5477d9366dffe28e868bd9009832..4bc77b58ed852e0b28db18d1f7efb28d14640da3 100644 (file)
--- 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 4188d8166ac8804099ea4051d6f63b8bcf8ba356..3d1d1688620ee41b66ff7786bd60ef0cdd58ac31 100644 (file)
--- 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 d9c60fb986a011b72420829b69c8fe0aa805eb94..632e75e5249ef9453b96074f84bd4182b557ad9c 100644 (file)
--- 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 79bc25ba226530f2ab3c0119c5f1b6d8313b6dcf..3b66fc9833e1af4876c4f4d8ef668fa3f266c105 100644 (file)
--- 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 9f9515adf13bc29a0bc713b115f352aa73b484ca..0917110cfdeb309638470183d62b0fb02d49b2cb 100644 (file)
--- 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 f56c4ff8fbbc84059159faa3971515fe3ce5ea65..8d66116c23b1743daac09866693848b654879364 100644 (file)
--- 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 5e7ec3fbdedb0a0fa82439f8600d435325d19185..83987e8e07caef66690115a6de55ec4e37dffa57 100644 (file)
--- 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 d0520c27014b6acc8cf1c0cb58bc3659153b8f98..323d8bc54426d40adbbc5e7344219db995585885 100644 (file)
--- a/src/mds/Mantle.cc
+++ b/src/mds/Mantle.cc
@@ -19,6 +19,7 @@
 
 #include <fstream>
 
+#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 0008ef06c858f06ecdba2bd9a3463e8f20b68927..bd3edabd56f3e639420035a9b464b1c017923f38 100644 (file)
--- 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 bb42b21b905b6122a9a558d0559264e0ff9f5608..9f1f236fa9614bf68ee94677548c9588baf9745c 100644 (file)
--- 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 afc91c3961bf754c482e885ecb40ac2fa175d453..ab23531c92e12456beb8665658e2fa4126a246fc 100644 (file)
--- 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 5b06470ae8ef690e853402f978ae38e5beb6a1f0..e0b09360410b04b6cce08a19ce7c8ad5206f0f1e 100644 (file)
--- 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 e7dd17534ee683bba80b4515792e0d4a8bceeb41..06331a09b96a3e47ee95dba2f42b3c6447cceb4b 100644 (file)
--- 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 137a476a3d073c5ab04dd3c75d286c885f7395e2..3f9b93d3a2b35d7ff8bde65873320fb98445d42e 100644 (file)
--- 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 8ffc4258949ac90409eda0cee55433d8026836ed..4518abef6cfd4182562cf74da7b09c812826836a 100644 (file)
--- 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 d7f449b66bd1264de94e4125dfeea777fc7096d1..403dbe7561a9dcd20b9a1e85a66f7038e029e4af 100644 (file)
--- 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 c0c6e93e5b3b7b76bc71ab1b21ec24d066f7c652..f34d343fcc07f81d91a897a1e3b1e8ca7a61ef07 100644 (file)
--- 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 027b461efadcf2c2e7f1d28e8693ade752b5e500..a000408652533ae3f492a94fc8fe726af2a8a33d 100644 (file)
--- 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 fccb377e581d4a15f1dd8d36490baffa2e12ddee..3b8def2f6e4f29e8fb0682c9cff5357c173a988a 100644 (file)
--- 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 07af2be2a1b50ac2dfa658e8048cf474fecd90d6..132f722947b6846ad4e3e0823c18ceffc1a650d3 100644 (file)
--- 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 d068af6a5101b0a84a6d9ba53c81510e4901edc8..8faf6bdf6b17115e162ae52216fce62a1cd374ae 100644 (file)
--- 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 218444a861c95db325e0cec6c3777814413d5592..72ad59491e5351042b3ad447750492040d87c8b1 100644 (file)
--- 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 b159021f50382b4dee5e7c678b14b3b659e3eb30..7a87e60886b7441ac4c2612a67b9ca4f8ea8a525 100644 (file)
--- 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 c2b79655ad36b227e1ec16d783c6808b6580bc7b..e55183ae45b032159e9e34a8b76f62188d3cac27 100644 (file)
--- 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 69fc37ff698127158678027d9806cc7cf4b96720..6027fc7ddf170d2dd702f2c92c25d10bd3a58f80 100644 (file)
--- 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 dcd2b1554f3dafb514e8cbf5300eabe64f6dabde..2fd7941225f13d62c1796260b6e886683e6f2e4b 100644 (file)
--- 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 984776960f7bd56165b04f048e3647a876f5685a..85216fbc6aed3ffe5bc24eb345a78d92837ad242 100644 (file)
--- 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 1f75db973e7857a69613198173417e9cd487c205..a406baf872f250f4b8a84d030092773b2399d4bb 100644 (file)
--- 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 c8c6c909e16f7cbeb761554f906b20849bee6f00..bf767b11db278634659ca5de758988d67bd9524d 100644 (file)
--- a/src/os/FuseStore.cc
+++ b/src/os/FuseStore.cc
@@ -20,6 +20,7 @@
 #include <sys/mount.h>
 #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 115bd0cfa44858e39c17f40ded0c831501407b37..638c7830e8ea95d46735ad4a22a6fe983f25f31f 100644 (file)
--- 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 309d19ae20407f1b90fb373112f16d8edaa298d8..0a8b3379fa420ca44545640fe0e9dc6d14621abd 100644 (file)
--- a/src/os/bluestore/BitAllocator.cc
+++ b/src/os/bluestore/BitAllocator.cc
@@ -25,6 +25,7 @@
 #include "common/debug.h"
 #include <math.h>
 
+#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 326442f5edffd1f1e2d8b53d0cd7cade1996d1ef..497a53cba8f1103a0ff93472ffaa3ce8e4837b93 100644 (file)
--- 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 8de18d8f86dfa5e7062b34508dbebf5195d15969..bba7a6fe207511bd8fc94d4f2879947664ee7b86 100644 (file)
--- 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 205d81dd10c28698ec347e8e72d0b558c56af150..91a5912d21f0f2f50a08f31cb1d16249f6a7ed1f 100644 (file)
--- 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 654d12b6c0f3a9dbfe45657e0f1c4aa4e90f1c3a..ac2cdddc74f1c9e12b752474b03b5bb18c732265 100644 (file)
--- 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 19f87ac332fda95046dd7c64e5d36a13ac9455ac..219a3578a1360736373aa02fb9575ac38dd7fc37 100644 (file)
--- 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 3bc0ed9cc9771228df0d0808a579d92f11160e6d..361a9df6758421df675d7d2bb45dbd26e12e3bae 100644 (file)
--- 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 4ed431fe0a4a4b393d12a0f4c8e5876d47386a90..2fb8dd260295a8847718381e70332302ca04b22d 100644 (file)
--- 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 c84ae7bb7268edce570bf1d0f8bc5eb0492f9da0..090f1fce8110e8281212b458641a9c8416508db2 100644 (file)
--- 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 0d52f1121abf9d887af411776b4b32facc76a095..461d5c182749462019eb429ce4875c85ee8b8133 100644 (file)
--- 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 a4685b8c33671e40c951012824a16e8ea5f30023..ed42875e68cf846bc7c61f3c5b254918864df6f7 100644 (file)
--- 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 f11e419a944b91ad00517dffad4acb5d4fa4bc87..55c9b11212a6370b8c08a29fa4e4ddb1f2105938 100644 (file)
--- 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 1d3d6fb5d3248744151e41c2c4a0991b93f5e283..281b03775642569b16727ba284140545727d8ef4 100644 (file)
--- a/src/os/filestore/FileJournal.h
+++ b/src/os/filestore/FileJournal.h
@@ -31,6 +31,9 @@ using std::deque;
 # include <libaio.h>
 #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 aa3c14110f345b78fc006c88ec4f2b3d0e6115d5..ace293675beedaa646dad0ee02971aba2e776c95 100644 (file)
--- 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 ba179b9d6d1c4d8793d7b3565250e438b37632d8..7206557169b8e45057608338528f607dbfe65cb2 100644 (file)
--- 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 897f8c4b9a87e3174572401617bc6c11eea6e341..b88fb2a86c63647431af5e98d8935552a35c07b7 100644 (file)
--- 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 a3fbb974217cdecf023a2cbcc0ee26224c93f07b..5163065e336bddbcdf9f36249eb5cdf3b1620f12 100644 (file)
--- 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 e0d753ecf44fce1bb92dabfd2228c3e3dc83a9e6..23557ad141a413dce09cc75627e2d5a65f069640 100644 (file)
--- 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 365692ca8671137f64cbc6e515dd4c636dd15e35..df9f6e3e3d51504d394dee52c5f4d11680a92d1d 100644 (file)
--- 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 d4756b12ee58cf09b63474e377f7acc0292ffd2c..912a5ebcb9be5e1e13e7ba4bc9941a07cf975fa8 100755 (executable)
--- 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 fd1c1f2ceb359c9e3c1e548e5da5ab2ac92989fa..be3e30641850e1096c7c06994bd5ff61a955c543 100644 (file)
--- 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 23afdfad5b4da34d466dfea0681c8f45cb5403ca..4ee75d8490ba8d99457e93c0c3733bd9a4ede9ab 100644 (file)
--- 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 684a9446f19f05d608085dc2821d77d867d08e29..4789dc519d91f52cb76dcf052420cf850165d9e6 100644 (file)
--- 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 f9b49cbb4f0f28f5e1a273a79ec6cfccf3002669..c9de4531dd1fa239034b342e0613c5956f078969 100644 (file)
--- 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 321c20aa9b007b9b8af85a29d9ed0f0c85ff9f15..c55844f5ab578bae698d75f987d6b9e67e66fa20 100644 (file)
--- 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 <sstream>
 
+#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 199d4ba3a8ea47b0ca1eecd386e9a178cea32dc5..832911eee993ea71142417b0fb7d131d30339e4d 100644 (file)
--- 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 c07ba17589e9e188e4cb352d4cea2b7cd37b0722..79e49e713344ab2c0b94169999733898128bb9be 100644 (file)
--- 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 837f69f450ddad757aae7cdef46a140e73c37904..0e70dca75dffc4501baf6ef8005d200c845b907d 100644 (file)
--- 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 71e3706306b26a65263038756ebbfdb62955d87c..f16f85a803fd123c5ce665a09ce77183748d6552 100644 (file)
--- 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 81c0c99365bcbd6fbd4770fda9157c915f7b8d91..94d8951ef267978148c13d867c7cfe3c8da87b8e 100644 (file)
--- 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 20f808aba80c714bf7fd40dda1f3342f16d9547d..deceaf7ccc00023b1794fe2d7721e3f9304d5939 100644 (file)
--- 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 4090d1c56492eecc898ce190716f81fc5250ff0d..0ec5edda3f1ab08fd25268238d41ff1701688f99 100644 (file)
--- 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 5a329e2ceb3d4610ba1e1de22a8b6e783121dc65..e35f6b1da2454898a70315d39a4081f80b04a752 100644 (file)
--- 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 bbf0a204c210ae88a905246483a2c45e3c5634f2..bdf93c974f338ab89bbeb2b8436ac9101c9c50ad 100644 (file)
--- 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 ea0f9a08f7e983a15faef577cc68e118f59fb3f9..3d57b0ad94590cc98c5f81731d919773481aabf3 100644 (file)
--- 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 e596ec0dd50dc2ad0100a4ea2d290a672b905831..ffb996dc0a77361ae6cbad8b25b48e4da4176585 100644 (file)
--- 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 36c8033a8d3d682073d53fc4d01c4c79bb173b8c..6e0753da2e19aba3d767dcd8c1ac5d2a3e353c41 100644 (file)
--- 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 282281a4142eda12f4d542fa1e53e31f7cdf8d50..219a36b68374ba0ff56988dbf295e78a0b57c11a 100644 (file)
--- 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 67ce77d89a1d351d9f9d8c8a57042043e41be2c6..fb623d6cca6a619da3d0bbd5965ae0fa471a1635 100644 (file)
--- 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 69dc01d976bc3a8b09839ee89b2926b10b34974a..501dbeb356baca4d292787ecb219f52ea8d098dc 100644 (file)
--- 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 c375f2dcf3195f8d765a188e5bc945fdf1a4b423..3a58e6874abe2da236b37c054b502aa81b313c30 100644 (file)
--- 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 e2d8dd9ad015d26e0af0243b96113621706b8824..a01094d5c9766b519f3506f5a6f48949dc36b832 100644 (file)
--- 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 c4e34a344d7676835e199193fec052c3a319bb99..b723f5422b931aea09903e03b367e0984939ded3 100644 (file)
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -23,6 +23,7 @@
 
 #include <sstream>
 
+#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 f2c7f3ac6442021335ee705830ebd831e1e390e4..3081dc00d64bb2c01168bc82ad1507e3abfeb858 100644 (file)
--- 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 <iostream>
 #include <map>
 
-#include <boost/algorithm/string.hpp> 
+#include <boost/algorithm/string.hpp>
 
 #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 f00c65eb428962c875f81fb504a92b5c2c98de56..162217909e269f606dd407a5c1caa8d8f1f042f9 100644 (file)
--- 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 0bfc1eda840c008b2eb805685ba22ac4269233b8..c5e04b47ab8f69f9bb1d0af86a9cd88f46314486 100644 (file)
--- 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 63fce5185c50f51709cdb119170ede1895785fe3..00940670ae367793237cd1c2c6aaae63236d96bb 100644 (file)
--- a/src/rgw/rgw_env.cc
+++ b/src/rgw/rgw_env.cc
@@ -6,9 +6,9 @@
 
 #include <string>
 #include <map>
-
 #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 24e186e2d4675fc004f01aef7b0494bda6ac1e5b..a047bcd378019bd8f140b21c5f8851cc1a434c2d 100644 (file)
--- 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 2ae281f72bf10cab2983f526975e426cb094d8bb..f42629a08ccfdb95089a6c15f2f6b327898e71d4 100644 (file)
--- 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 a5f5d395055b3878f1a5fb4ed7964ffd1ffef19b..c9251141f2ee9a6082f5fe1b59ab2f2463b38b24 100644 (file)
--- a/src/rgw/rgw_gc.cc
+++ b/src/rgw/rgw_gc.cc
@@ -10,6 +10,7 @@
 
 #include <list>
 
+#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 076846c3082b834017704d0cd00c092d9cfd7aac..18de1a9b617ff9aae3fb38eb2f86b1758e844e70 100644 (file)
--- 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 ca4b1e372037ba77a5f5810cbf37648e73c65b60..33a0a28228263c89cd70360cd30425b8ec07bd63 100644 (file)
--- 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 4d2fc811134097148305dd20e658d11048093a0b..9e98ec537a460f8a48ae6b10c8e10014c9d58499 100644 (file)
--- 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 4821b1888ee39f7d52cb2a9d8247e7a06cc15a22..0aa1a23d3864acd0eb856b383d235f4917dee408 100644 (file)
--- 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 9bbd0095112ad5b091cba109088cc27f377ec706..3bc033f0a6889ff5afcc0b863f1e4626d901fed2 100644 (file)
--- 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 fd10cfcb739792df99a57c28afc6ec8e98df0d16..29a272184ebc694038a1f9a86704703cdac0c653 100644 (file)
--- 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 99001f2f71d57e308c9014892e9c3895ec84fd87..de5d97ae3dddd0c43fcfbdb9361c8ec7c9a85610 100644 (file)
--- 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 d3f1d2db25a9cd7cc68703f6bbc0e1da76b49fd7..6c59c9c762a2d7c50bb3e688db0398cc85a987f7 100644 (file)
--- 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 f1062121788f534ed2b3fda125d509735342033a..c364c27cbcaeaa4b23f44dbbdab7660a6437e5d1 100644 (file)
--- 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 33c4b2dbdd6468ab86cd82d7c79c6f869dad0abb..5ab827d7378313f5e9fda26ef4d84b567f3f6bf9 100644 (file)
--- 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 e51b3d7e36be145e0616f5355b45350d864cd4b8..dcad1993e25e0f72c49a9f2bc07d8ff83f64a156 100644 (file)
--- 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 1fe03c6fd1533ae5033a9c5a51c8a172f46f4ad3..f02b17a97a569a7a210b0ba8513e0da10317f750 100644 (file)
--- 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 2c0f5e46e9c258c08162acb51d0de519546d6be8..645d4b855fe00307054a90c32a47a6d9fb1753a9 100644 (file)
--- 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 478a5cac08a2dfac510d1cd4621e042e7e7cbec1..cb720ba1f852b21d8144d1caecef89cf7356bf1c 100644 (file)
--- 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 202a8b20f0a9d82bcabcfa910cabea26c9b3a0d1..272e304f17ebf086dca7e878389d50821e726110 100644 (file)
--- 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 02bdf17065a4318c535010e0752b62641e7b9936..af9c024e13f7ba91ce0123c0fa25884e25aa2bd2 100644 (file)
--- 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 4768284c289dc4a06c779dfcb14bcc0b8d083ec2..919815f572366027caa65dd53f79e99bf9c9266a 100644 (file)
--- 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 63b100e19a69d87a45fb94adde32fffbe7e98890..86a587796051f5392a29c5c5739a003781114798 100644 (file)
--- 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 2a02c8ac87894106a7b411d00a10a2200ef1e0bd..5bc9b920e78f4330e743adaa7549de4f7d35b2e2 100644 (file)
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -31,6 +31,7 @@
 
 #include <boost/utility/string_ref.hpp>
 
+#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 5b8cec9c0264cab2fe80a6961097c3e7e40c01d6..50fdf8e2ea61ff02babb667a0a2787ab81c61460 100644 (file)
--- 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 029d257dc843e45bedafd221663fcc0801f69363..359cde08a8c4a9b39b86e5e353c7cc3612ef00bb 100644 (file)
--- a/src/test/TestSignalHandlers.cc
+++ b/src/test/TestSignalHandlers.cc
@@ -28,6 +28,7 @@
 #include <sstream>
 #include <string>
 
+#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 0caa06c82a6bc9ff403aaf18d366b9f855f6019a..ca8f2f3e0644f5590fb825737c441962f0a6060b 100644 (file)
--- 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<int> myset;

diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc
index 005c576bc8bd0121a14cb0a77bc997a071918dd8..ecd2f4978b11d26e5dba674a7b3cb9d135c3d343 100644 (file)
--- 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 1305b7b06bde7c4018e763883afecddf6067feef..35d905aa3d622062af00cea5c169701ec9ecbcb8 100644 (file)
--- 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 ced44da91efc2db83cd220e65516b150e7a88632..1745bc60452c4652bec55bdcb32c2f230a700a14 100644 (file)
--- 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 <list>
 #include <boost/scope_exit.hpp>
 
+#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 9e03d4095972ab33938af463e892abc758e0ae82..14adc3f831c734e9f429ab5497f0f83dc6d4152f 100644 (file)
--- 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 eba0e386ca3167cbb98d1f5ab49652e70dab1280..a8f1abd4ac34910fd00ce24cb1734da932dbcadf 100644 (file)
--- 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 9a5558dc2f1b985220f93c4ff8aefd177403b00b..0c5f7011521a9587480dbd4ce0d535f8bdcb0c1f 100644 (file)
--- 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 0da95b368f10aa82828c6d501cb637068ce95ab8..9bb28ef8b99f5f4c50fb1cb1dc0647b67f02eef2 100644 (file)
--- 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 4fd6822052ac380ecd957ace4e24641c3c2993ca..772715eb4ccbe2eab4a4ca68aa68906889df72b1 100644 (file)
--- 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 6a08e9c37c8de668a7e186ad448dd9995196913b..2596166546bd4847740cd7312147b4ffee9b5d6a 100644 (file)
--- 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 873c68afd7f484343a3e28eacf21eca9dd0819f5..9a4f6e1be949d6bd8c1959b45c2f9d52d88d4586 100644 (file)
--- 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 0216b78f3347621f58fecfc65949751306a0a138..9d49e4d2e488d21f57bdb8442674f0bd0b936adc 100644 (file)
--- 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 26c0f9f2557e99a9664808bb36d7fac1bbd016e0..aa5374790ca23fd2836d437245840ba2e78ea107 100644 (file)
--- 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 5b0d1c1e84fddf9dcae2bb034fd73c8633aca222..b5e6dde149a0a0fd34666e315774b372cc354873 100644 (file)
--- 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 72c43a48ca3e8afeb5904a0342a0b580f4ad98d2..484fe8ec8df9b1026881e6328ab7831fb1bf26e8 100644 (file)
--- 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 17f560176a0009f47210562f5e0da2e04cdc126a..ddcf3ef109f1cf36ed26a7acd5424d028e617ef7 100644 (file)
--- 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 deed9ec21a54255572714c287c18d24492265e4b..c25f473c6fd9e2426c8067c3c30fc62d97a974d5 100644 (file)
--- a/src/test/rbd_mirror/random_write.cc
+++ b/src/test/rbd_mirror/random_write.cc
@@ -12,6 +12,7 @@
 #include <string>
 #include <vector>
 
+#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 a66b75eb24c4037025a16181e043a5af9ee6aef6..afcfbb7d645f8ce9d71c65af6c92d067ed48a700 100644 (file)
--- 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 e53870bd8f39973687463a40d0eb504e2ba18e37..691b3cb0b79486db6062042619a30e763e48c0fd 100644 (file)
--- 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 c91fb1413a605fab00c73fad0130d306aa94007e..80f5fe36d247ec3c0d841f04d7551dff84c03105 100644 (file)
--- 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 8892942bd532f64454c3e75b48853c7501e23b49..45b897b68fe8d1a1ba7be563bcc129b789424b64 100644 (file)
--- 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 a6ab88d84f6982602d63a018cbd25f0a34a2cc5d..2984db678cf0b19eb53b4bfaa4b94d8de1aed99f 100644 (file)
--- 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 7ff86ef3c202cd1ab98acb2e5a7a63e2b34b98c4..2bd70406715b9442fe4e1390fd60c37fc65319a9 100644 (file)
--- 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 c2cd44a3ccf9cf501da6fb96165a37386760f0ec..f50bedcab3626895752a47d922a19d85a6f1e7ec 100644 (file)
--- 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 aefbb2f67793c690483c4899a7dfaf4a31ba3267..6db9f4b0746641e7fb7a0633300c521a93e7de39 100644 (file)
--- 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 7df93900f0b76dbf884a6689bff416b0ca37d1b7..2b88231ca81ae7d102860095d5f06b47be22beca 100644 (file)
--- 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 5176eeabbb08446754c5d7dfd0703a0b9009c41a..f47ff6be596052e703722952e1c45bae86f3b014 100644 (file)
--- 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 e51ffd5ca50b813ac1cc8071268679443e5c1030..6ee89e8c86b2d44ea4fd44680aeb91bce8fdf96d 100644 (file)
--- 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 c027eafca75c4c56fb5d9038970b90a405483bdd..0c0436419b8af1a6b67aa5e4a223e8b0434c000e 100644 (file)
--- 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 16b0cea9ce78ad0352abbdb1c53221c5f330bff8..2ef02c5d31f2158731828c586b41c53374987ca5 100644 (file)
--- 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 1cb8299a0c1014cefcf417b147136f63d11ffe3a..42aa7d29034c440e768e98505da548a875cbaf99 100644 (file)
--- 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 fd915c747444f44346372f0c388cf4b694a5dcbe..201147392d18b64ef33a2bb681f3661b52021bdb 100644 (file)
--- 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 5d0b3eda6d84ebbc20506d59bafbd5d5d59dbba8..ad7a1a4dfefb85406cbf16d5011858ae90da4c5c 100644 (file)
--- 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 4f72142d6576056c65800b12adc7963d958898dc..0f27e1c6db70f2fca2dce11c92b03337c369632d 100644 (file)
--- 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 2efdc65833b5044eb76c50e21d8d1ae4965296e8..76691ea2d70673a6e6d4344713b14009c4fc7dbf 100644 (file)
--- a/src/tools/rbd/action/ImportDiff.cc
+++ b/src/tools/rbd/action/ImportDiff.cc
@@ -12,6 +12,7 @@
 #include <iostream>
 #include <boost/program_options.hpp>
 
+#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 85627b318bd244cafeb7a2399c48fbd57857267c..cdb593887b8972bade87002dc2c18834da6208dc 100644 (file)
--- a/src/tools/rbd/action/MergeDiff.cc
+++ b/src/tools/rbd/action/MergeDiff.cc
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <boost/program_options.hpp>
 
+#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 516e1e3deef91bde16774d421171551c635e4d38..87b6f8ee52fdff1c75d9ccf1ecada7ea27118ff8 100644 (file)
--- 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 d879368e3c2cd837cdaa0587242074897af4ba30..773ad493b004966344340667d2c6e465b435a394 100644 (file)
--- 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 ff2fa32623bad34153e15dd72ec8b10e459e2135..b08a220611f65b807a213a06ce756240f65abf22 100644 (file)
--- 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 1f55a039d7ae084e98ffc337a539314b7a236901..e19ed5637949ca922e14fef32d0881554c7209d3 100644 (file)
--- 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 dc03589b3874c49a3d3498eee864548a59a0e6d9..f77a5c46b22839143e8ed9944389cf654f1aadbd 100644 (file)
--- 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 0463a81d139d2b47fdc9a324dd0bd32211ac7505..e14f10c3d4ded719641779c12dfc985b14fa2cb2 100644 (file)
--- 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 3e431f22ee11fd2cfa4d772d1e933bd4dbfd9ce5..360e00dd48a9fe76e55cf1868fe86aa5eb0a6009 100644 (file)
--- 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 6c70c9b78dffd85f96e5c0bf59a35d7e5129fd9d..930bd13749ced0e200bc5c616e244ddb261c677b 100644 (file)
--- 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 20ddf90da613b1686c66e10340f50e04be0a12a8..af0845989ef121dacd8b7be0b67b0bbb19670bbd 100644 (file)
--- 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 247c6299c68dd7b45d4e6adea86a2b369b44d738..d7ea6085edbe2559ada25510f2058cdb221b10ad 100644 (file)
--- 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 27c6c1ca2bde6d989851a82b981f4db6520ac8c9..96c726a6206595c6e263409f679e2beef27d8a4c 100644 (file)
--- 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 acb3600b60cfc01d3996bf71e4deedf47399c208..5aaf352e863017eddfad783eb35d2d55622fbf3f 100644 (file)
--- 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 <boost/variant.hpp>
 
+#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 9cf6af2b3219a13e36e2f3ad7cf5525d4d7b8091..c908d0977666b5b40f7cc148dd4e021412c87079 100644 (file)
--- 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 <type_traits>
 
+#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 588e64ec35a65ef2568f9ba6672e61f4a34d3c83..ff1493ddfd42d02f489db000eff571a84d7b7048 100644 (file)
--- 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 <type_traits>
 
+#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 917a706594a07c9f7c30b9ff9429333f7dbd6d0a..faca72b47d43d2f7d796ff7a6ce90cbd976ab9ba 100644 (file)
--- 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 336f114c41e4083ff1ad0b41aecedc8a0cee4879..734ed829f77c56bc1152adf5227de858cd6b4a58 100644 (file)
--- 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 df607e2ad20ba05e95494c175b427a964aac8bf7..bfafb515a185692ddb9f10c0f49b132c463fb444 100644 (file)
--- 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 974dfb720b7c7e10194be448acf2e9c322291643..028af8bb34674faf0d58bb03749f41769c7ab07a 100644 (file)
--- 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 28f95dc4ff87aa5a111e738303076a3e2e67c420..3f8657063fdaa1a460bf2fe9f47a1fbfa16eefec 100644 (file)
--- 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 52cf040b1d0c0956b82ee07b2cbb52a1e24910cd..5fd0e948572b15b52defae4686c82762de3d02c3 100644 (file)
--- 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 8341fbe06e45310261a188c923ee16aeebdde008..9e21bf7907504011ffc8bba7e8614ada40a8b73d 100644 (file)
--- 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 <set>
 
+#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 04a747cbf9a67ff310a8ddea0e39a620bcd73ab4..526bd5120f0cae98f5797a50e0182df9ed25caa8 100644 (file)
--- 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: "