Merge PR #26893 into master

* refs/pull/26893/head:
	qa: unmount clients prior to marking fs down

Reviewed-by: Zheng Yan <zyan@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-03-12 10:47:53 -07:00
commit 4f3df2cc82
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -96,6 +96,8 @@ class TestClusterResize(CephFSTestCase):
That marking a FS down does not generate a health warning
"""
self.mount_a.umount_wait()
self.fs.set_down()
try:
self.wait_for_health("", 30)
@ -111,6 +113,8 @@ class TestClusterResize(CephFSTestCase):
That marking a FS down twice does not wipe old_max_mds.
"""
self.mount_a.umount_wait()
self.grow(2)
self.fs.set_down()
self.fs.wait_for_daemons()
@ -123,6 +127,8 @@ class TestClusterResize(CephFSTestCase):
That setting max_mds undoes down.
"""
self.mount_a.umount_wait()
self.fs.set_down()
self.fs.wait_for_daemons()
self.grow(2)
@ -133,6 +139,8 @@ class TestClusterResize(CephFSTestCase):
That down setting toggles and sets max_mds appropriately.
"""
self.mount_a.umount_wait()
self.fs.set_down()
self.fs.wait_for_daemons()
self.assertEqual(self.fs.get_var("max_mds"), 0)