]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: assert there is a peering event 3326/head 3327/head
authorSage Weil <sage@redhat.com>
Thu, 8 Jan 2015 19:10:45 +0000 (11:10 -0800)
committerSage Weil <sage@redhat.com>
Fri, 9 Jan 2015 00:14:56 +0000 (16:14 -0800)
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>
src/osd/OSD.cc

index 7c45ae80d0e56e34757dd65068fbe9c5179822f3..6245f427d5d258fbf8a8a59e4212a893e98998a2 100644 (file)
@@ -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);