]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #36823 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Jun 2021 02:47:53 +0000 (19:47 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Jun 2021 02:47:53 +0000 (19:47 -0700)
* refs/pull/36823/head:
qa : add a test for the cmd, dump cache
mds : add timeout to the command, dump cache, to prevent it from running too long and affecting the service

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

Simple merge
Simple merge
Simple merge