From 6ab32eedff99715b9fcbc3d3f750906a658bbd7a Mon Sep 17 00:00:00 2001 From: Yang Sheng Date: Mon, 4 Nov 2019 11:49:41 +0800 Subject: [PATCH] LU-12925 test: assign right initial value for test_61 This patch snip from commit:591a9b4cebc510ff5. The test_62 would be failed since test_61 leave a failover state in some case. Signed-off-by: Patrick Farrell Signed-off-by: Yang Sheng Change-Id: If46a6d435bcaafb9000abb032ac561c5453776ee Reviewed-on: https://review.whamcloud.com/36660 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Wang Shilong Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 0882bcc..ae648a3 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -4522,7 +4522,7 @@ test_60() { # LU-471 run_test 60 "check mkfs.lustre --mkfsoptions -E -O options setting" test_61() { # LU-80 - local lxattr=false + local lxattr=$(large_xattr_enabled) [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.1.53) ] || skip "Need MDS version at least 2.1.53" @@ -4581,7 +4581,7 @@ test_61() { # LU-80 log "remove large xattr $name from $file" setfattr -x $name $file || error "removing $name from $file failed" - if $lxattr; then + if $lxattr && [ $(facet_fstype $SINGLEMDS) == ldiskfs ]; then stopall || error "stopping for e2fsck run" for num in $(seq $MDSCOUNT); do run_e2fsck $(facet_active_host mds$num) \ -- 1.8.3.1