LU-4444 tests: Skip conf-sanity/69 on zfs

[fs/lustre-release.git] / lustre / tests / conf-sanity.sh

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index cc0f3dc..1f00d34 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -75,8 +75,8 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then
 fi
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
-# bug number for skipped test:        LU-2778 LU-2059
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 57b     50h"
+# bug number for skipped test:        LU-2778 LU-2059 LU-4444
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 57b     50h     69"
 
 init_logging
 
@@ -1062,6 +1062,78 @@ test_28() {
 }
 run_test 28 "permanent parameter setting"
 
+test_28a() { # LU-4221
+       [[ $(lustre_version_code ost1) -ge $(version_code 2.5.52) ]] ||
+               { skip "Need OST version at least 2.5.52" && return 0; }
+       [ "$(facet_fstype ost1)" = "zfs" ] &&
+               skip "LU-4221: no such proc params for ZFS OSTs" && return
+
+       local name
+       local param
+       local cmd
+       local old
+       local new
+       local device="$FSNAME-OST0000"
+
+       setup
+
+       # In this test we will set three kinds of proc parameters with
+       # lctl conf_param:
+       # 1. the ones moved from the OFD to the OSD, and only their
+       #    symlinks kept in obdfilter
+       # 2. non-symlink ones in the OFD
+       # 3. non-symlink ones in the OSD
+
+       # Check 1.
+       # prepare a symlink parameter in the OFD
+       name="writethrough_cache_enable"
+       param="$device.ost.$name"
+       cmd="$LCTL get_param -n obdfilter.$device.$name"
+
+       # conf_param the symlink parameter in the OFD
+       old=$(do_facet ost1 $cmd)
+       new=$(((old + 1) % 2))
+       set_conf_param_and_check ost1 "$cmd" "$param" $new ||
+               error "lctl conf_param $device.ost.$param=$new failed"
+
+       # conf_param the target parameter in the OSD
+       param="$device.osd.$name"
+       cmd="$LCTL get_param -n osd-*.$device.$name"
+       set_conf_param_and_check ost1 "$cmd" "$param" $old ||
+               error "lctl conf_param $device.osd.$param=$old failed"
+
+       # Check 2.
+       # prepare a non-symlink parameter in the OFD
+       name="client_cache_seconds"
+       param="$device.ost.$name"
+       cmd="$LCTL get_param -n obdfilter.$device.$name"
+
+       # conf_param the parameter in the OFD
+       old=$(do_facet ost1 $cmd)
+       new=$((old * 2))
+       set_conf_param_and_check ost1 "$cmd" "$param" $new ||
+               error "lctl conf_param $device.ost.$param=$new failed"
+       set_conf_param_and_check ost1 "$cmd" "$param" $old ||
+               error "lctl conf_param $device.ost.$param=$old failed"
+
+       # Check 3.
+       # prepare a non-symlink parameter in the OSD
+       name="lma_self_repair"
+       param="$device.osd.$name"
+       cmd="$LCTL get_param -n osd-*.$device.$name"
+
+       # conf_param the parameter in the OSD
+       old=$(do_facet ost1 $cmd)
+       new=$(((old + 1) % 2))
+       set_conf_param_and_check ost1 "$cmd" "$param" $new ||
+               error "lctl conf_param $device.osd.$param=$new failed"
+       set_conf_param_and_check ost1 "$cmd" "$param" $old ||
+               error "lctl conf_param $device.osd.$param=$old failed"
+
+       cleanup
+}
+run_test 28a "set symlink parameters permanently with conf_param"
+
 test_29() {
        [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return
         setup > /dev/null 2>&1
@@ -3907,7 +3979,8 @@ test_69() {
 
        mkdir -p $DIR/$tdir
        $LFS setstripe -i 0 $DIR/$tdir
-       createmany -o $DIR/$tdir/$tfile- $num_create
+       createmany -o $DIR/$tdir/$tfile- $num_create ||
+               error "createmany: failed to create $num_create files: $?"
        # delete all of the files with objects on OST0 so the
        # filesystem is not inconsistent later on
        $LFS find $MOUNT --ost 0 | xargs rm