LU-13498 tests: remove tests from ALWAYS_EXCEPT with SSK

A number of tests had previously been added to ALWAYS_EXCEPT
when SHARED_KEY was in use.
These tests are now passing with SSK, so remove them from the
exception list.

Test-Parameters: trivial
Test-Parameters: env=SHARED_KEY=true mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity,recovery-small,replay-dual,replay-single,sanity-hsm,conf-sanity
Test-Parameters: env=SHARED_KEY=true mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity,recovery-small,replay-dual,replay-single,sanity-hsm,conf-sanity
Test-Parameters: env=SHARED_KEY=true mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity,recovery-small,replay-dual,replay-single,sanity-hsm,conf-sanity
Test-Parameters: env=SHARED_KEY=true mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2 testlist=sanity,recovery-small,replay-dual,replay-single,sanity-hsm,conf-sanity
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: If72b212a23b915afdb723acf7254908e1c043e07
Reviewed-on: https://review.whamcloud.com/40161
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index d04a4bf..a6e2798 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -20,9 +20,7 @@ ALWAYS_EXCEPT="$ALWAYS_EXCEPT  110 115"
 
 if $SHARED_KEY; then
        # bug number for skipped tests: LU-9795 (all below)
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   0       31      32a     32d     35a"
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   53a     53b     54b     76a     76b"
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   76c     76d     78      103"
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   84      86      103"
 fi
 
 if ! combined_mgs_mds; then

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 60b78f2..66a960f 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -9,11 +9,6 @@ init_test_env $@
 init_logging
 
 ALWAYS_EXCEPT="$RECOVERY_SMALL_EXCEPT "
-if $SHARED_KEY; then
-       # bug number for skipped test: LU-12896
-       ALWAYS_EXCEPT+="               110k"
-       # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-fi
 
 build_test_filter
 

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 8aa6de8..fea7dbb 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -21,11 +21,6 @@ ALWAYS_EXCEPT+="                14b     21b     26 "
 # bug number for skipped test:        LU-2230
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 21b"
 
-if $SHARED_KEY; then
-# bug number for skipped tests:  LU-9795 LU-9795
-       ALWAYS_EXCEPT+="         0a      0b "
-fi
-
 #                                   7  (min)"
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="21b "
 

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 1e1124a..bba8635 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -15,12 +15,10 @@ if [ "$mds1_FSTYPE" = zfs ]; then
        # bug number for skipped test: LU-11388
        ALWAYS_EXCEPT+="               131b"
 fi
+
 if $SHARED_KEY; then
-       # bug number for skipped tests: LU-9795 (all below)
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   0b      0c      0d      34      45"
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   47      58b     58c     71a     85a"
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   85b     86      88      89      90"
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   93a     100a    100b    120"
+       # bug number for skipped tests: LU-9795
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   121"
 fi
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 9f31459..740e6f6 100755 (executable)
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -16,8 +16,8 @@ init_logging
 
 ALWAYS_EXCEPT="$SANITY_HSM_EXCEPT "
 if $SHARED_KEY; then
-# bug number for skipped tests: LU-9795 LU-9795
-       ALWAYS_EXCEPT+="        13      402b "
+# bug number for skipped tests: LU-9795
+       ALWAYS_EXCEPT+="        402b "
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 fi
 

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 7ca9728..e9b944d 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -44,11 +44,6 @@ ALWAYS_EXCEPT+="               42a     42b     42c "
 # bug number:    LU-8411 LU-9054
 ALWAYS_EXCEPT+=" 407     312"
 
-if $SHARED_KEY; then
-       # bug number:    LU-9795 LU-9795 LU-9795 LU-9795
-       ALWAYS_EXCEPT+=" 17n     60a     133g    300f"
-fi
-
 selinux_status=$(getenforce)
 if [ "$selinux_status" != "Disabled" ]; then
        # bug number:
@@ -24295,8 +24290,6 @@ run_test 810 "partial page writes on ZFS (LU-11663)"
 test_812a() {
        [ $OST1_VERSION -lt $(version_code 2.12.51) ] &&
                skip "OST < 2.12.51 doesn't support this fail_loc"
-       [ "$SHARED_KEY" = true ] &&
-               skip "OSC connections never go IDLE with Shared-Keys enabled"
 
        $LFS setstripe -c 1 -i 0 $DIR/$tfile
        # ensure ost1 is connected
@@ -24318,8 +24311,6 @@ run_test 812a "do not drop reqs generated when imp is going to idle (LU-11951)"
 test_812b() { # LU-12378
        [ $OST1_VERSION -lt $(version_code 2.12.51) ] &&
                skip "OST < 2.12.51 doesn't support this fail_loc"
-       [ "$SHARED_KEY" = true ] &&
-               skip "OSC connections never go IDLE with Shared-Keys enabled"
 
        $LFS setstripe -c 1 -i 0 $DIR/$tfile || error "setstripe failed"
        # ensure ost1 is connected
@@ -24527,9 +24518,6 @@ test_815()
 run_test 815 "zero byte tiny write doesn't hang (LU-12382)"
 
 test_816() {
-       [ "$SHARED_KEY" = true ] &&
-               skip "OSC connections never go IDLE with Shared-Keys enabled"
-
        $LFS setstripe -c 1 -i 0 $DIR/$tfile
        # ensure ost1 is connected
        stat $DIR/$tfile >/dev/null || error "can't stat"