Whamcloud - gitweb
LU-12925 test: assign right initial value for test_61 60/36660/2
authorYang Sheng <ys@whamcloud.com>
Mon, 4 Nov 2019 03:49:41 +0000 (11:49 +0800)
committerOleg Drokin <green@whamcloud.com>
Thu, 21 Nov 2019 07:36:06 +0000 (07:36 +0000)
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>
lustre/tests/conf-sanity.sh

index 0882bcc..ae648a3 100644 (file)
@@ -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) \