]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: clear requeued peering events
authorSage Weil <sage@redhat.com>
Tue, 2 Jan 2018 21:25:01 +0000 (15:25 -0600)
committerSage Weil <sage@redhat.com>
Thu, 11 Jan 2018 23:07:00 +0000 (17:07 -0600)
Broken by fffcc8a50e684c9b67643ec002869a8b7024b01c

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3f07137f5f6b0448271be273db7b375ab1844d38)

src/osd/PG.cc

index 9f5b1b4c4a70cb1d25e3a0503ad374dbea53dd77..25e5e34fdf92038f761e00001576d60b2a0d13ae 100644 (file)
@@ -5872,6 +5872,7 @@ void PG::take_waiters()
        ++i) {
     osd->osd->enqueue_peering_evt_front(info.pgid, *i);
   }
+  peering_waiters.clear();
 }
 
 void PG::do_peering_event(PGPeeringEventRef evt, RecoveryCtx *rctx)