From: David Zafman <dzafman@redhat.com>
Date: Thu, 9 Apr 2015 23:26:07 +0000 (-0700)
Subject: osd: Show number of divergent_priors in log message
X-Git-Tag: v0.94.7~28^2~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eab0f2403ea025f4e659dc055323b227023448ab;p=ceph.git

osd: Show number of divergent_priors in log message

Report dirty_divergent_priors as true or false
Use dout(5) so tests can verify divergent_priors created

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 67da8feb0ff8659f1ff812be5a866ef5e97facf2)
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index b619bcd929bf..7c11aa90f8a1 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -742,10 +742,12 @@ void PGLog::write_log(
   ObjectStore::Transaction& t, const coll_t& coll, const ghobject_t &log_oid)
 {
   if (is_dirty()) {
-    dout(10) << "write_log with: "
+    dout(5) << "write_log with: "
 	     << "dirty_to: " << dirty_to
 	     << ", dirty_from: " << dirty_from
-	     << ", dirty_divergent_priors: " << dirty_divergent_priors
+	     << ", dirty_divergent_priors: "
+	     << (dirty_divergent_priors ? "true" : "false")
+	     << ", divergent_priors: " << divergent_priors.size()
 	     << ", writeout_from: " << writeout_from
 	     << ", trimmed: " << trimmed
 	     << dendl;