]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks: update test_journal_repair
authorJohn Spray <jspray@redhat.com>
Wed, 1 Apr 2015 12:56:13 +0000 (13:56 +0100)
committerJohn Spray <jspray@redhat.com>
Tue, 14 Apr 2015 13:13:40 +0000 (14:13 +0100)
This broke with recent Client changes that
do better caching of readdir results, such
that doing an ls twice is no longer sufficient
to see a fresh result after repair - we need
to remount instead.

Signed-off-by: John Spray <john.spray@redhat.com>
tasks/cephfs/test_journal_repair.py

index 5626e88ba9be41c5afca0ac4a4ceaf0d005696c3..99f4a5db8e376ca4d6dcc13542c12b6f8da7f6ee 100644 (file)
@@ -96,6 +96,9 @@ class TestJournalRepair(CephFSTestCase):
         # will be invisible in readdir).
         # FIXME: hook in forward scrub here to regenerate backtraces
         proc = self.mount_a.run_shell(['ls', '-R'])
+        self.mount_a.umount_wait()  # remount to clear client cache before our second ls
+        self.mount_a.mount()
+        self.mount_a.wait_until_mounted()
 
         proc = self.mount_a.run_shell(['ls', '-R'])
         self.assertEqual(proc.stdout.getvalue().strip(),