Merge pull request #7405 from ceph/wip-diag-14438

osd: build_past_intervals_parallel() add diagnostics before assert

Reviewed-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2016-02-10 14:08:09 -08:00
commit 78799a9c92

View File

@ -3275,6 +3275,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);