From: Samuel Just <sam.just@inktank.com>
Date: Sun, 16 Feb 2014 01:32:34 +0000 (-0800)
Subject: ReplicatedPG: add some debugging if waiting_for_commit is non-empty
X-Git-Tag: v0.78~163^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc31c4b32aeada72e6007001e2e1b97dc97a7217;p=ceph.git

ReplicatedPG: add some debugging if waiting_for_commit is non-empty

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 8bec51266f0e..520705dd6fc8 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -8761,7 +8761,20 @@ void ReplicatedPG::apply_and_flush_repops(bool requeue)
 
   if (requeue) {
     requeue_ops(rq);
-    assert(waiting_for_ondisk.empty());
+    if (!waiting_for_ondisk.empty()) {
+      for (map<eversion_t, list<OpRequestRef> >::iterator i =
+	     waiting_for_ondisk.begin();
+	   i != waiting_for_ondisk.end();
+	   ++i) {
+	for (list<OpRequestRef>::iterator j = i->second.begin();
+	     j != i->second.end();
+	     ++j) {
+	  derr << __func__ << ": op " << *((*j)->get_req()) << " waiting on "
+	       << i->first << dendl;
+	}
+      }
+      assert(waiting_for_ondisk.empty());
+    }
   }
 
   waiting_for_ondisk.clear();