LU-18957 tests: remove obsolete osc.*.contention_seconds

Remove the obsolete parameter osc.*.contention_seconds from
sanity.sh and sanityn.sh.

Test-Parameters: trivial
Fixes: 5ad00e36eca1 ("LU-14838 osc: Remove client contention support")

Signed-off-by: Emoly Liu <emoly@whamcloud.com>
Change-Id: Ie62157adfe7588fa66f9e82d97affee8ad2d4436
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58998
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 4bbe979..0c8d90a 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -23035,9 +23035,8 @@ test_216() { # bug 20317
        local facets=$(get_facets OST)
        local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
 
-       save_lustre_params client "osc.*.contention_seconds" > $p
        save_lustre_params $facets \
-               "ldlm.namespaces.filter-*.max_nolock_bytes" >> $p
+               "ldlm.namespaces.filter-*.max_nolock_bytes" > $p
        save_lustre_params $facets \
                "ldlm.namespaces.filter-*.contended_locks" >> $p
        save_lustre_params $facets \
@@ -23050,7 +23049,6 @@ test_216() { # bug 20317
                "lctl set_param -n ldlm.namespaces.*.max_nolock_bytes=2000000 \
                        ldlm.namespaces.filter-*.contended_locks=0 \
                        ldlm.namespaces.filter-*.contention_seconds=60"
-       lctl set_param -n osc.*.contention_seconds=60
 
        $DIRECTIO write $DIR/$tfile 0 10 4096
        $CHECKSTAT -s 40960 $DIR/$tfile
@@ -23060,7 +23058,6 @@ test_216() { # bug 20317
                "lctl set_param -n ldlm.namespaces.filter-*.max_nolock_bytes=0 \
                        ldlm.namespaces.filter-*.contended_locks=32 \
                        ldlm.namespaces.filter-*.contention_seconds=0"
-       lctl set_param -n osc.*.contention_seconds=0
        clear_stats osc.*.osc_stats
 
        dd if=/dev/zero of=$DIR/$tfile count=0

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index e779270..96eb324 100755 (executable)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -1262,9 +1262,8 @@ test_32b() { # bug 11270
        local facets=$(get_facets OST)
        local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
 
-       save_lustre_params client "osc.*.contention_seconds" > $p
        save_lustre_params $facets \
-               "ldlm.namespaces.filter-*.max_nolock_bytes" >> $p
+               "ldlm.namespaces.filter-*.max_nolock_bytes" > $p
        save_lustre_params $facets \
                "ldlm.namespaces.filter-*.contended_locks" >> $p
        save_lustre_params $facets \
@@ -1276,7 +1275,6 @@ test_32b() { # bug 11270
                "lctl set_param -n ldlm.namespaces.*.max_nolock_bytes=2000000 \
                        ldlm.namespaces.filter-*.contended_locks=0 \
                        ldlm.namespaces.filter-*.contention_seconds=60"
-       lctl set_param -n $OSC.*.contention_seconds=60
        for i in {1..5}; do
                dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1 conv=notrunc > \
                        /dev/null 2>&1
@@ -1286,13 +1284,12 @@ test_32b() { # bug 11270
        [ $(calc_stats $OSC.*.${OSC}_stats lockless_write_bytes) -ne 0 ] ||
                error "lockless i/o was not triggered"
        # disable lockless i/o (it is disabled by default)
+       # set contention_seconds to 0 at client too, otherwise Lustre still
+       # remembers lock contention
        do_nodes $(comma_list $(osts_nodes)) \
                "lctl set_param -n ldlm.namespaces.filter-*.max_nolock_bytes=0 \
                        ldlm.namespaces.filter-*.contended_locks=32 \
                        ldlm.namespaces.filter-*.contention_seconds=0"
-       # set contention_seconds to 0 at client too, otherwise Lustre still
-       # remembers lock contention
-       lctl set_param -n $OSC.*.contention_seconds=0
        clear_stats $OSC.*.${OSC}_stats
        for i in {1..1}; do
                dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1 conv=notrunc > \