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

Merge pull request #13807 from jcsp/wip-19118

Browse Source 
mds: try to avoid false positive heartbeat timeouts
This commit is contained in:
John Spray 2017-03-15 21:15:43 +00:00 committed by GitHub
commit 5f6fa0e2f7
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mds/MDCache.cc
View File

@ -5610,6 +5610,8 @@ void MDCache::export_remaining_imported_caps()
mds->send_message_client_counted(stale, q->first);
}
}
mds->heartbeat_reset();
}
for (map<inodeno_t, list<MDSInternalContextBase*> >::iterator p = cap_reconnect_waiters.begin();

2
src/mds/MDSRank.cc
View File

@ -487,6 +487,8 @@ bool MDSRank::_dispatch(Message *m, bool new_msg)
dout(0) << "unrecognized message " << *m << dendl;
return false;
}
heartbeat_reset();
}
if (dispatch_depth > 1)

7
src/mds/MDSRank.h
View File

@ -237,7 +237,6 @@ class MDSRank {
bool _dispatch(Message *m, bool new_msg);
ceph::heartbeat_handle_d *hb; // Heartbeat for threads using mds_lock
void heartbeat_reset();
bool is_stale_message(Message *m) const;
@ -308,6 +307,12 @@ class MDSRank {
void respawn();
// <<<
/**
* Call this periodically if inside a potentially long running piece
* of code while holding the mds_lock
*/
void heartbeat_reset();
/**
* Report state DAMAGED to the mon, and then pass on to respawn(). Call
* this when an unrecoverable error is encountered while attempting