From: John Spray <jspray@redhat.com>
Date: Mon, 9 Jun 2014 11:37:03 +0000 (+0100)
Subject: mds: journal-related debug messages
X-Git-Tag: v0.84~164^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96f4e7823c13b8846eba44d63c81c79b14d2ca20;p=ceph.git

mds: journal-related debug messages

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/JournalPointer.cc b/src/mds/JournalPointer.cc
index 6eb82575f2be3..8c8c54c08de92 100644
--- a/src/mds/JournalPointer.cc
+++ b/src/mds/JournalPointer.cc
@@ -24,7 +24,7 @@
 
 #define dout_subsys ceph_subsys_journaler
 #undef dout_prefix
-#define dout_prefix *_dout << objecter->messenger->get_myname() << ".journalpointer"
+#define dout_prefix *_dout << objecter->messenger->get_myname() << ".journalpointer "
 
 
 std::string JournalPointer::get_object_id() const
diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 5578f742bff95..941fe41b217d7 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -40,7 +40,6 @@ void Journaler::set_writeable()
 void Journaler::create(ceph_file_layout *l, stream_format_t const sf)
 {
   assert(!readonly);
-  ldout(cct, 1) << "create blank journal" << dendl;
   state = STATE_ACTIVE;
 
   stream_format = sf;
@@ -50,6 +49,9 @@ void Journaler::create(ceph_file_layout *l, stream_format_t const sf)
   prezeroing_pos = prezero_pos = write_pos = flush_pos = safe_pos =
     read_pos = requested_pos = received_pos =
     expire_pos = trimming_pos = trimmed_pos = layout.fl_stripe_count * layout.fl_object_size;
+
+  ldout(cct, 1) << "created blank journal at inode 0x" << std::hex << ino << std::dec
+    << ", format=" << stream_format << dendl;
 }
 
 void Journaler::set_layout(ceph_file_layout *l)
@@ -76,6 +78,7 @@ ostream& operator<<(ostream& out, Journaler::Header &h)
   return out << "loghead(trim " << h.trimmed_pos
 	     << ", expire " << h.expire_pos
 	     << ", write " << h.write_pos
+	     << ", stream_format " << (int)(h.stream_format)
 	     << ")";
 }