]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitc4de4b3df884bcb3f023c12d387752bfd8200612
treebf23f9ecf2ef43a50bc57631966eac7f5488d044
parent05d7f883a04d230cf17b40a1c7e8044d402c6a30
parent430d93222a1fd320512859449f3a2644a5694546
Merge PR #36823 into master

* 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>
src/mds/MDCache.cc
src/mds/MDSDaemon.cc
src/mds/MDSRank.cc