]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22999 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 6 Aug 2018 18:43:35 +0000 (11:43 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 6 Aug 2018 18:43:35 +0000 (11:43 -0700)
* refs/pull/22999/head:
mds: consider max age of dispatch queue when finding stale client
mds: reset heartbeat map at potential time-consuming places
mds: change MDSRank::finished_queue to deque

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDSRank.cc

Simple merge