LU-1193 tests: test script fixes for incompatibility

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index da81213..d937c31 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1210,7 +1210,7 @@ test_32a() {
                { skip_env "Cannot untar $DISK1_8" && return 0; }
 
        load_modules
-       $LCTL set_param debug=$PTLDEBUG
+       $LCTL set_param debug="$PTLDEBUG"
 
        $TUNEFS $tmpdir/mds || error "tunefs failed"
 
@@ -1277,11 +1277,13 @@ test_32b() {
                { skip_env "Cannot untar $DISK1_8" && return ; }
 
        load_modules
-       $LCTL set_param debug="config"
+       $LCTL set_param debug="+config"
        local NEWNAME=lustre
 
        # writeconf will cause servers to register with their current nids
-       $TUNEFS --writeconf --fsname=$NEWNAME $tmpdir/mds || error "tunefs failed"
+       $TUNEFS --writeconf --erase-params \
+        --param mdt.identity_upcall=$L_GETIDENTITY \
+        --fsname=$NEWNAME $tmpdir/mds || error "tunefs failed"
        combined_mgs_mds || stop mgs
 
        start32 mds1 $tmpdir/mds "-o loop" && \
@@ -1291,7 +1293,8 @@ test_32b() {
        echo MDS uuid $UUID
        [ "$UUID" == "${NEWNAME}-MDT0000_UUID" ] || error "UUID is wrong: $UUID"
 
-       $TUNEFS --mgsnode=$HOSTNAME --writeconf --fsname=$NEWNAME $tmpdir/ost1 ||\
+       $TUNEFS  --writeconf --erase-params \
+        --mgsnode=$HOSTNAME --fsname=$NEWNAME $tmpdir/ost1 ||\
            error "tunefs failed"
        start32 ost1 $tmpdir/ost1 "-o loop" || return 5
        UUID=$($LCTL get_param -n obdfilter.${NEWNAME}-OST0000.uuid)
@@ -1993,7 +1996,7 @@ test_46a() {
        #second client see all ost's
 
        mount_client $MOUNT2 || return 8
-       $LFS setstripe $MOUNT2 -c -1 || return 9
+       $LFS setstripe -c -1 $MOUNT2 || return 9
        $LFS getstripe $MOUNT2 || return 10
 
        echo "ok" > $MOUNT2/widestripe
@@ -2061,9 +2064,9 @@ cleanup_48() {
 test_48() { # bug 17636
        reformat
        setup_noconfig
-        check_mount || return 2
+       check_mount || return 2
 
-       $LFS setstripe $MOUNT -c -1 || return 9
+       $LFS setstripe -c -1 $MOUNT || return 9
        $LFS getstripe $MOUNT || return 10
 
        echo "ok" > $MOUNT/widestripe
@@ -2436,7 +2439,7 @@ test_52() {
        [ $? -eq 0 ] || { error "Unable to create temporary file"; return 6; }
        sleep 1
 
-       $LFS setstripe $DIR/$tdir -c -1 -s 1M
+       $LFS setstripe -c -1 -S 1M $DIR/$tdir
        [ $? -eq 0 ] || { error "lfs setstripe failed"; return 7; }
 
        for (( i=0; i < nrfiles; i++ )); do
@@ -2765,6 +2768,9 @@ run_test 60 "check mkfs.lustre --mkfsoptions -E -O options setting"
 test_61() { # LU-80
     local reformat=false
 
+    [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.1.53) ] ||
+        { skip "Need MDS version at least 2.1.53"; return 0; }
+
     if ! large_xattr_enabled; then
         reformat=true
         local mds_dev=$(mdsdevname ${SINGLEMDS//mds/})
@@ -2821,6 +2827,22 @@ test_61() { # LU-80
 }
 run_test 61 "large xattr"
 
+test_62() {
+    # MRP-118
+    local mdsdev=$(mdsdevname 1)
+    local ostdev=$(ostdevname 1)
+
+    echo "disable journal for mds"
+    do_facet mds tune2fs -O ^has_journal $mdsdev || error "tune2fs failed"
+    start_mds && error "MDT start should fail"
+    echo "disable journal for ost"
+    do_facet ost1 tune2fs -O ^has_journal $ostdev || error "tune2fs failed"
+    start_ost && error "OST start should fail"
+    cleanup || return $?
+    reformat_and_config
+}
+run_test 62 "start with disabled journal"
+
 if ! combined_mgs_mds ; then
        stop mgs
 fi