From: huangjun <hjwsm1989@gmail.com>
Date: Fri, 16 Dec 2016 09:47:55 +0000 (+0800)
Subject:   osd/PrimaryLogPG: unify the access to primary pg
X-Git-Tag: v12.0.0~395^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73fc22590a18ee17bc67507657eeb4fa1bc2d2c2;p=ceph.git

  osd/PrimaryLogPG: unify the access to primary pg

  Signed-off-by: huangjun <hjwsm1989@gmail.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 714d535e50a0..7d6554ca4024 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -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 {