]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: kick right merge source 24010/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Mon, 10 Sep 2018 12:01:24 +0000 (20:01 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Mon, 10 Sep 2018 12:01:24 +0000 (20:01 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSD.cc

index 2498c5ecb62f32723e4852270a7e2da4293207e6..df58048ba51504d46932835f94da06d3a75cd13f 100644 (file)
@@ -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(),