From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Jan 2018 21:25:01 +0000 (-0600)
Subject: osd/PG: clear requeued peering events
X-Git-Tag: v13.0.2~510^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d004d918ad4ce4ab4ecbeede4cc339607f2db69;p=ceph.git

osd/PG: clear requeued peering events

Broken by fffcc8a50e684c9b67643ec002869a8b7024b01c

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 9f5b1b4c4a70..25e5e34fdf92 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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)