RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tasks/mds_flush: remove #10387 workaround

Browse Source 
Now that #10387 is fixed in master, we can tighten
up this test to ensure that the expected deletions
are happening.

Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2015-01-07 13:08:30 +00:00
parent b23da9797a
commit f6bcbe3701
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/mds_flush.py
View File

@ -86,19 +86,9 @@ class TestFlush(CephFSTestCase):
self.assertEqual(flush_data['return_code'], 0) self.assertEqual(flush_data['return_code'], 0)
# We expect two deletions, one of the dirfrag and one of the backtrace # We expect two deletions, one of the dirfrag and one of the backtrace
try: wait_until_true(
# try/except to work around 10387 -- the 'try' is the expected behaviour, the lambda: self.fs.mds_asok(['perf', 'dump'])['objecter']['osdop_delete'] - initial_dels >= 2,
# expect is when we encounter 10387 and have to unmount the client to get 60) # timeout is fairly long to allow for tick+rados latencies
# past.
wait_until_true(
lambda: self.fs.mds_asok(['perf', 'dump'])['objecter']['osdop_delete'] - initial_dels >= 2,
60) # timeout is fairly long to allow for tick+rados latencies
except RuntimeError:
# #10387 case: client doesn't release cap on dir until unmounted, holding up dirfrag delete
self.mount.umount_wait()
wait_until_true(
lambda: self.fs.mds_asok(['perf', 'dump'])['objecter']['osdop_delete'] - initial_dels >= 2,
20)
with self.assertRaises(ObjectNotFound): with self.assertRaises(ObjectNotFound):
self.fs.list_dirfrag(dir_ino) self.fs.list_dirfrag(dir_ino)