From: David Zafman <dzafman@redhat.com>
Date: Tue, 26 Jan 2016 15:28:52 +0000 (-0800)
Subject: osd: build_past_intervals_parallel() add diagnostics before assert
X-Git-Tag: v10.0.4~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db3dc4d3e2a74cfd366cd2ef4d0c9c4581269113;p=ceph.git

osd: build_past_intervals_parallel() add diagnostics before assert

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 785ac507d7a7..e2ffb3a35379 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3140,6 +3140,10 @@ void OSD::build_past_intervals_parallel()
 
     // Verify same_interval_since is correct
     if (pg->info.history.same_interval_since) {
+      if (pg->info.history.same_interval_since != p.same_interval_since) {
+	dout(0) << __func__ << " history same_interval_since " << pg->info.history.same_interval_since << dendl;
+	dout(0) << __func__ << " same_interval_since " << p.same_interval_since << " pg " << *pg << dendl;
+      }
       assert(pg->info.history.same_interval_since == p.same_interval_since);
     } else {
       assert(p.same_interval_since);