RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12527 from hjwsm1989/cleanup

Browse Source 
osd/PrimaryLogPG: unify the access to primary pg

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-12-22 09:24:01 -06:00 committed by GitHub
commit 5308718101
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/PrimaryLogPG.cc
View File

@ -3542,7 +3542,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(
@ -9691,7 +9691,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 {