]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12aba24 0565fb3)
Merge PR #25536 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 22 Dec 2018 01:16:11 +0000 (17:16 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 22 Dec 2018 01:16:11 +0000 (17:16 -0800)
* refs/pull/25536/head:
mds: don't wait for snapclient sync when handling reconnect
mds: extend reconnect period when mds is busy
mds: renew client session when receiving any message
mds: use mono_clock for reconnect timeout

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDSRank.cc patch | diff1 | diff2 | blob | history
src/mds/Server.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/MDSRank.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.