From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 10 Sep 2018 12:01:24 +0000 (+0800)
Subject: osd/OSD: kick right merge source
X-Git-Tag: v14.0.1~342^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bc97797eb5103f9ec2a2042b7e8d015026ea122;p=ceph.git

osd/OSD: kick right merge source

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2498c5ecb62f..df58048ba515 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8216,10 +8216,10 @@ bool OSD::advance_pg(
 	    pg->write_if_dirty(rctx);
 	    pg->unlock();
 	    // kick source(s) to get them ready
-	    for (auto& i : sources) {
-	      dout(20) << __func__ << " kicking source " << i.first << dendl;
+	    for (auto& i : children) {
+	      dout(20) << __func__ << " kicking source " << i << dendl;
 	      enqueue_peering_evt(
-		i.first,
+		i,
 		PGPeeringEventRef(
 		  std::make_shared<PGPeeringEvent>(
 		    nextmap->get_epoch(),