RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2785 from athanatos/wip-9821

Browse Source 
PG:: reset_interval_flush and in set_last_peering_reset

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2014-10-23 13:45:26 -07:00
commit 8a9b953b7c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/PG.cc
View File

@ -4568,7 +4568,10 @@ bool PG::old_peering_msg(epoch_t reply_epoch, epoch_t query_epoch)
void PG::set_last_peering_reset()
{
dout(20) << "set_last_peering_reset " << get_osdmap()->get_epoch() << dendl;
last_peering_reset = get_osdmap()->get_epoch();
if (last_peering_reset != get_osdmap()->get_epoch()) {
last_peering_reset = get_osdmap()->get_epoch();
reset_interval_flush();
}
}
struct FlushState {
@ -4622,7 +4625,6 @@ void PG::start_peering_interval(
const OSDMapRef osdmap = get_osdmap();
set_last_peering_reset();
reset_interval_flush();
vector<int> oldacting, oldup;
int oldrole = get_role();