From: Yang Sheng <ys@whamcloud.com>
Date: Mon, 4 Nov 2019 03:49:41 +0000 (+0800)
Subject: LU-12925 test: assign right initial value for test_61
X-Git-Tag: 2.12.4-RC1~82
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F36660%2F2;p=fs%2Flustre-release.git

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 <pfarrell@whamcloud.com>
Signed-off-by: Yang Sheng <ys@whamcloud.com>
Change-Id: If46a6d435bcaafb9000abb032ac561c5453776ee
Reviewed-on: https://review.whamcloud.com/36660
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

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) \