journal: improve debug log messages

rbd-mirror debugging involved potentially thousands of journals
concurrently running. The instance address will correlate log
messages between journals.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 11475f4fe740cccdfea459ebeabdca8cb94dc911)

diff --git a/src/journal/Entry.cc b/src/journal/Entry.cc
index f88dea86358baf7a693fba1e0e44a7dd1efe7035..257fa583af5e4eb8fd48508f659d751ae5952855 100644 (file)
--- a/src/journal/Entry.cc
+++ b/src/journal/Entry.cc
@@ -9,7 +9,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "Entry: "
+#define dout_prefix *_dout << "Entry: " << this << " "
 
 namespace journal {
 

diff --git a/src/journal/JournalMetadata.cc b/src/journal/JournalMetadata.cc
index 63c67f21cdb1ad89a52d4c8a6c82475e485f12ac..de46bd7ff0af1624e7fa299b19f728dd498e2dde 100644 (file)
--- a/src/journal/JournalMetadata.cc
+++ b/src/journal/JournalMetadata.cc
@@ -11,7 +11,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "JournalMetadata: "
+#define dout_prefix *_dout << "JournalMetadata: " << this << " "
 
 namespace journal {
 

diff --git a/src/journal/JournalPlayer.cc b/src/journal/JournalPlayer.cc
index 30d6cdd36cfa08e160dc048471bf466e016715fd..750f936b20c714388d086c95895e867b3c8c5124 100644 (file)
--- a/src/journal/JournalPlayer.cc
+++ b/src/journal/JournalPlayer.cc
@@ -8,7 +8,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "JournalPlayer: "
+#define dout_prefix *_dout << "JournalPlayer: " << this << " "
 
 namespace journal {
 

diff --git a/src/journal/JournalRecorder.cc b/src/journal/JournalRecorder.cc
index b4da4ff006737a963c900a35c1b992a5edd6f15e..4cbe7391ee94d93dddd605e5a7e886f9ced24694 100644 (file)
--- a/src/journal/JournalRecorder.cc
+++ b/src/journal/JournalRecorder.cc
@@ -8,7 +8,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "JournalRecorder: "
+#define dout_prefix *_dout << "JournalRecorder: " << this << " "
 
 namespace journal {
 

diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc
index a4a47fab76c5cbfbf99e98177ef97b55bc2ada7f..aef16c2fb0acbaf050eccbbc8966515436c48da7 100644 (file)
--- a/src/journal/JournalTrimmer.cc
+++ b/src/journal/JournalTrimmer.cc
@@ -9,7 +9,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "JournalTrimmer: "
+#define dout_prefix *_dout << "JournalTrimmer: " << this << " "
 
 namespace journal {
 

diff --git a/src/journal/Journaler.cc b/src/journal/Journaler.cc
index 27cc33845c01f40d4a6bb3ef5537274b73f2fc83..c08a11b71de490a7357aa726dd96e7b39ba04203 100644 (file)
--- a/src/journal/Journaler.cc
+++ b/src/journal/Journaler.cc
@@ -19,7 +19,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "Journaler: "
+#define dout_prefix *_dout << "Journaler: " << this << " "
 
 namespace journal {
 

diff --git a/src/journal/ObjectPlayer.cc b/src/journal/ObjectPlayer.cc
index 31939e9bb167fd9da015e91e07c45bd41d20bfc7..43adb5da5cd637b5d74421ad287297a405487d63 100644 (file)
--- a/src/journal/ObjectPlayer.cc
+++ b/src/journal/ObjectPlayer.cc
@@ -8,7 +8,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "ObjectPlayer: "
+#define dout_prefix *_dout << "ObjectPlayer: " << this << " "
 
 namespace journal {
 

diff --git a/src/journal/ObjectRecorder.cc b/src/journal/ObjectRecorder.cc
index 5972d899b135585791c1be6e78b0015142189dbc..0cf2fd1e8ea05b48c516732b659e08453afaffce 100644 (file)
--- a/src/journal/ObjectRecorder.cc
+++ b/src/journal/ObjectRecorder.cc
@@ -10,7 +10,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << "ObjectRecorder: "
+#define dout_prefix *_dout << "ObjectRecorder: " << this << " "
 
 using namespace cls::journal;