From 1d2e2195873e82a603531e34f3f7d4c634490209 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Tue, 11 Jan 2022 20:23:30 +0300 Subject: [PATCH] LU-15429 tests: mount_mds_client() fix mount/umount client is to be executed on active facet/host, not on mds1_HOST. Without this fix test_140a() fails on failover setup: CMD: lm0101 umount /mnt/lustre2 2>&1 CMD: lm0102 rmdir /mnt/lustre2 lm0102: rmdir: failed to remove '/mnt/lustre2': No such file or directory test_140a: FAIL: no clients with recovery disabled To reproduce the failure just run: ONLY="107 140a" sh recovery-small.sh on failover setup where mds1_HOST != mds1failover_HOST. Fixes: 8bd04b4e57 ("LU-12722 target: disable recovery for local clients") Test-Parameters: trivial env=ONLY="140a 140b" testlist=recovery-small Signed-off-by: Elena Gryaznova HPE-bug-id: LUS-10669 Reviewed-by: Vladimir Saveliev Reviewed-by: Alexander Boyko Change-Id: Ifbdedfda840e8421fa8a969f73131ca23982a28b Reviewed-on: https://review.whamcloud.com/46043 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 89da980..ddb70cf 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -2425,16 +2425,16 @@ zconf_umount() { # Mount the file system on the MDS mount_mds_client() { - local mds_HOST=${SINGLEMDS}_HOST - echo $mds_HOST - zconf_mount $mds1_HOST $MOUNT2 $MOUNT_OPTS || - error "unable to mount $MOUNT2 on MDS" + local host=$(facet_active_host $SINGLEMDS) + echo $host + zconf_mount $host $MOUNT2 $MOUNT_OPTS || + error "unable to mount $MOUNT2 on $host" } # Unmount the file system on the MDS umount_mds_client() { - local mds_HOST=${SINGLEMDS}_HOST - zconf_umount $mds1_HOST $MOUNT2 + local host=$(facet_active_host $SINGLEMDS) + zconf_umount $host $MOUNT2 do_facet $SINGLEMDS "rmdir $MOUNT2" } -- 1.8.3.1