Skip to content

Commit 38d4aef

Browse files
committed
qa: remove old MovedDir test
This is now superseded by test from the previous commit. The MovedDir workload assumes that an ancestry with missing dirfrags will not be recreated. Signed-off-by: Patrick Donnelly <[email protected]>
1 parent 4feb30b commit 38d4aef

File tree

1 file changed

+0
-34
lines changed

1 file changed

+0
-34
lines changed

qa/tasks/cephfs/test_data_scan.py

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -417,37 +417,6 @@ def validate(self):
417417
return self._errors
418418

419419

420-
class MovedDir(Workload):
421-
def write(self):
422-
# Create a nested dir that we will then move. Two files with two different
423-
# backtraces referring to the moved dir, claiming two different locations for
424-
# it. We will see that only one backtrace wins and the dir ends up with
425-
# single linkage.
426-
self._mount.run_shell(["mkdir", "-p", "grandmother/parent"])
427-
self._mount.write_n_mb("grandmother/parent/orig_pos_file", 1)
428-
self._filesystem.mds_asok(["flush", "journal"])
429-
self._mount.run_shell(["mkdir", "grandfather"])
430-
self._mount.run_shell(["mv", "grandmother/parent", "grandfather"])
431-
self._mount.write_n_mb("grandfather/parent/new_pos_file", 2)
432-
self._filesystem.mds_asok(["flush", "journal"])
433-
434-
self._initial_state = (
435-
self._mount.stat("grandfather/parent/orig_pos_file"),
436-
self._mount.stat("grandfather/parent/new_pos_file")
437-
)
438-
439-
def validate(self):
440-
root_files = self._mount.ls()
441-
self.assert_equal(len(root_files), 1)
442-
self.assert_equal(root_files[0] in ["grandfather", "grandmother"], True)
443-
winner = root_files[0]
444-
st_opf = self._mount.stat(f"{winner}/parent/orig_pos_file", sudo=True)
445-
st_npf = self._mount.stat(f"{winner}/parent/new_pos_file", sudo=True)
446-
447-
self.assert_equal(st_opf['st_size'], self._initial_state[0]['st_size'])
448-
self.assert_equal(st_npf['st_size'], self._initial_state[1]['st_size'])
449-
450-
451420
class MissingZerothObject(Workload):
452421
def write(self):
453422
self._mount.run_shell(["mkdir", "subdir"])
@@ -594,9 +563,6 @@ def test_rebuild_backtraceless(self):
594563
def test_rebuild_backtraceless_with_lf_dir_removed(self):
595564
self._rebuild_metadata(BacktracelessFileRemoveLostAndFoundDirectory(self.fs, self.mount_a), unmount=False)
596565

597-
def test_rebuild_moved_dir(self):
598-
self._rebuild_metadata(MovedDir(self.fs, self.mount_a))
599-
600566
def test_rebuild_missing_zeroth(self):
601567
self._rebuild_metadata(MissingZerothObject(self.fs, self.mount_a))
602568

0 commit comments

Comments
 (0)