From 0331d908abcb026fb450241ac8566d1a2bf425bc Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 22 Jul 2022 23:49:40 -0700 Subject: [PATCH] LU-13813 tests: fix stack_trap in conf-sanity test 110/111 This patch fixes stack_trap in conf-sanity test 110 and 111 to restore test environment. Test-Parameters: trivial env=SLOW=yes,ENABLE_QUOTA=yes \ clientdistro=el8.5 serverdistro=el8.5 testlist=conf-sanity Test-Parameters: trivial env=SLOW=yes,ENABLE_QUOTA=yes \ fstype=zfs \ clientdistro=el8.5 serverdistro=el8.5 testlist=conf-sanity Test-Parameters: trivial env=SLOW=yes,ENABLE_QUOTA=yes \ mdscount=2 mdtcount=4 \ clientdistro=el8.5 serverdistro=el8.5 testlist=conf-sanity Change-Id: I540d96e8ad2c4990e7da18fe22256b44e9a19c72 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/48021 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 lustre/tests/conf-sanity.sh diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh old mode 100644 new mode 100755 index 81c9a1e..0a549ae --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -8641,7 +8641,7 @@ test_110() local old_mdscount=$MDSCOUNT local old_ostcount=$OSTCOUNT local replace="" - stack_trap "MDSCOUNT=$old_mdscount OSTCOUNT=$old_ostcount" EXIT + stack_trap "MDSCOUNT=$old_mdscount OSTCOUNT=$old_ostcount; reformat" MDSCOUNT=1 OSTCOUNT=1 @@ -8748,7 +8748,8 @@ test_111() { local old_ostcount=$OSTCOUNT local old_mdssize=$MDSSIZE local replace="" - stack_trap "MDSSIZE=$MDSSIZE MDSCOUNT=$MDSCOUNT OSTCOUNT=$OSTCOUNT" EXIT + stack_trap "MDSSIZE=$old_mdssize MDSCOUNT=$old_mdscount \ + OSTCOUNT=$old_ostcount; reformat" MDSCOUNT=1 OSTCOUNT=1 (( MDSSIZE < 2400000 )) && MDSSIZE=2400000 # need at least 2.4GB @@ -8844,7 +8845,8 @@ test_111() { umount_client $MOUNT2 -f cleanup - (( $needskip )) && skip "ETA ${left}s after $num files / ${taken}s is too long" + ! (( $needskip )) || + echo "ETA ${left}s after $num files / ${taken}s is too long" run_e2fsck $(facet_active_host mds1) $(mdsdevname 1) -n MDSCOUNT=$old_mdscount -- 1.8.3.1