From: Elena Gryaznova Date: Thu, 22 Apr 2021 14:15:42 +0000 (+0300) Subject: LU-14632 tests: fix sanity-hsm test_606() X-Git-Tag: 2.14.52~80 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=1f7795fdd85a2aa39e41b26ab9b95bd3df740af7 LU-14632 tests: fix sanity-hsm test_606() After check_and_setup_lustre() mds1_dev is equal to /dev/mapper/mds1_flakey, which is unexported to saved real device (/dev/vdc) by stop(): stop mds1 elif dm_flakey_supported mds1; then dm_cleanup_dev mds1 unexport_dm_dev mds1 As a result stack_trap() is called with non existing /dev/mapper/mds1_flakey: stack_trap 'stop mds1; start mds1 /dev/mapper/mds1_flakey -o rw,user_xattr' EXIT and failed as: losetup: /dev/mapper/mds1_flakey: failed to set up loop device: No such file or directory Reproducer: run ONLY=606 sh sanity-hsm.sh on "failover" setup (mds1_HOST != mds1failover_HOST), no llmount.sh before the test Fixes: 54b9e3f78935 ("LU-684 tests: replace dev_read_only patch with dm-flakey") Test-Parameters: trivial testlist=sanity-hsm env=ONLY=606 Test-Parameters: fstype=zfs testlist=sanity-hsm env=ONLY=606 Signed-off-by: Elena Gryaznova HPE-bug-id: LUS-9920 Reviewed-by: Alexander Boyko Reviewed-by: Andriy Skulysh Change-Id: I9ab3cbcf67c6fd046861810a2ceab262f211436b Reviewed-on: https://review.whamcloud.com/43409 Reviewed-by: Jian Yu Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh index f378963..82b7c5a 100755 --- a/lustre/tests/sanity-hsm.sh +++ b/lustre/tests/sanity-hsm.sh @@ -5390,8 +5390,9 @@ test_606() { local entry #remount mds1 as ldiskfs or zfs type - stack_trap "stop mds1; start mds1 $(mdsdevname 1) $MDS_MOUNT_OPTS" EXIT stop mds1 || error "stop mds1 failed" + stack_trap "unmount_fstype mds1; start mds1 $(mdsdevname 1)\ + $MDS_MOUNT_OPTS" EXIT mount_fstype mds1 || error "remount mds1 failed" for ((i = 0; i < 1; i++)); do