From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Jan 2015 19:10:45 +0000 (-0800)
Subject: osd: assert there is a peering event
X-Git-Tag: v0.91~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3327%2Fhead;p=ceph.git

osd: assert there is a peering event

This became conditional way back in 12e22b3d44eba51a70d8babebc2684f0c46575a7
for unclear reasons.  It probably predates the in_use checks.  In any case,
at this point, we should only arrive here if the PG was queued, implying
that there will always be an event to process.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7c45ae80d0e5..6245f427d5d2 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8375,7 +8375,8 @@ void OSD::process_peering_events(
       // we need to requeue the PG explicitly since we didn't actually
       // handle an event
       peering_wq.queue(pg);
-    } else if (!pg->peering_queue.empty()) {
+    } else {
+      assert(!pg->peering_queue.empty());
       PG::CephPeeringEvtRef evt = pg->peering_queue.front();
       pg->peering_queue.pop_front();
       pg->handle_peering_event(evt, &rctx);