RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jewel-14196'

Browse Source
This commit is contained in:
Greg Farnum 2016-01-05 23:11:32 -08:00
commit eb1d4f607c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/cephfs/test_damage.py
View File

@ -203,9 +203,14 @@ class TestDamage(CephFSTestCase):
self.fs.mds_restart()
if mutation.expectation not in (DAMAGED_ON_LS, NO_DAMAGE):
# MDS may go to damaged state after coming up. Wait for damaged state first
try:
self.wait_until_true(lambda: self.is_marked_damaged(0), 60)
except RuntimeError:
pass
# Wait for MDS to either come up or go into damaged state
try:
self.wait_until_true(lambda: self.is_marked_damaged(0) or self.fs.are_daemons_healthy(), 60)
self.wait_until_true(lambda: self.is_marked_damaged(0) or self.fs.are_daemons_healthy(), 10)
except RuntimeError:
crashed = False
# Didn't make it to healthy or damaged, did it crash?