]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: unify the access to primary pg 12527/head
authorhuangjun <hjwsm1989@gmail.com>
Fri, 16 Dec 2016 09:47:55 +0000 (17:47 +0800)
committerhuangjun <hjwsm1989@gmail.com>
Fri, 16 Dec 2016 09:47:55 +0000 (17:47 +0800)
Signed-off-by: huangjun <hjwsm1989@gmail.com>
src/osd/PrimaryLogPG.cc

index 714d535e50a0125203138145ee930ad7263c7eb4..7d6554ca40249300b8052002ac5c9a7f690e920f 100644 (file)
@@ -3545,7 +3545,7 @@ void PrimaryLogPG::do_backfill(OpRequestRef op)
        MOSDPGBackfill::OP_BACKFILL_FINISH_ACK,
        get_osdmap()->get_epoch(),
        m->query_epoch,
-       spg_t(info.pgid.pgid, primary.shard));
+       spg_t(info.pgid.pgid, get_primary().shard));
       reply->set_priority(get_recovery_op_priority());
       osd->send_message_osd_cluster(reply, m->get_connection());
       queue_peering_event(
@@ -9690,7 +9690,7 @@ void PrimaryLogPG::_committed_pushed_object(
          get_primary().osd,
          new MOSDPGTrim(
            get_osdmap()->get_epoch(),
-           spg_t(info.pgid.pgid, primary.shard),
+           spg_t(info.pgid.pgid, get_primary().shard),
            last_complete_ondisk),
          get_osdmap()->get_epoch());
       } else {