RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-12 14:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: reset MDSRank heartbeat timeout even when MDS is laggy

Browse Source 
Fixes: #13067
Signed-off-by: Yan, Zheng <zyan@redhat.com>
This commit is contained in:
Yan, Zheng 2015-09-15 16:31:23 +08:00
parent 27d1e4d41e
commit 4e8242a049
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mds/MDSDaemon.cc
View File

@ -517,18 +517,10 @@ void MDSDaemon::tick()
// reschedule
reset_tick();
if (beacon.is_laggy()) {
dout(5) << "tick bailing out since we seem laggy" << dendl;
return;
}
// Call through to subsystems' tick functions
if (mds_rank) {
mds_rank->tick();
}
// Expose ourselves to Beacon to update health indicators
beacon.notify_health(mds_rank);
}
/* This function DOES put the passed message before returning*/

8
src/mds/MDSRank.cc
View File

@ -150,6 +150,11 @@ void MDSRankDispatcher::tick()
{
heartbeat_reset();
if (beacon.is_laggy()) {
dout(5) << "tick bailing out since we seem laggy" << dendl;
return;
}
check_ops_in_flight();
// Wake up thread in case we use to be laggy and have waiting_for_nolaggy
@ -194,6 +199,9 @@ void MDSRankDispatcher::tick()
if (snapserver)
snapserver->check_osd_map(false);
}
// Expose ourselves to Beacon to update health indicators
beacon.notify_health(this);
}
void MDSRankDispatcher::shutdown()