RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 00:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3154 from athanatos/wip-10059

Browse Source 
Wip 10059

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2014-12-11 13:28:03 -08:00
commit 9a04e7515d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osd/PG.cc
View File

@ -860,8 +860,6 @@ void PG::clear_primary_state()
osd->snap_trim_wq.dequeue(this);
agent_clear();
osd->remove_want_pg_temp(info.pgid.pgid);
}
/**
@ -4740,8 +4738,10 @@ void PG::start_peering_interval(
actingbackfill.clear();
// reset primary state?
if (was_old_primary || is_primary())
clear_primary_state();
if (was_old_primary || is_primary()) {
osd->remove_want_pg_temp(info.pgid.pgid);
}
clear_primary_state();
// pg->on_*
@ -5541,6 +5541,7 @@ void PG::RecoveryState::Primary::exit()
pg->want_acting.clear();
utime_t dur = ceph_clock_now(pg->cct) - enter_time;
pg->osd->recoverystate_perf->tinc(rs_primary_latency, dur);
pg->clear_primary_state();
}
/*---------Peering--------*/