LU-16842 fsx: tolerate delete last non-stale mirror error

[fs/lustre-release.git] / lustre / tests / run-llog.sh

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index 58bc5a4..714002a 100644 (file)
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -1,45 +1,42 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+#
+# This file is part of Lustre, http://www.lustre.org/
+#
+# lustre/tests/run-llog.sh
+#
+# Script to run the llog_test unit tests
+#
+
+LUSTRE=${LUSTRE:-$(dirname "$0")/..}
+. "$LUSTRE/tests/test-framework.sh"
+init_test_env "$@"
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
-. $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
-
-load_llog_test() {
-    grep -q llog_test /proc/modules && return
-    # Module should have been placed with other lustre modules...
-    modprobe llog_test 2>&1 | grep -v "llog_test not found"
-    grep -q llog_test /proc/modules && return
-    # But maybe we're running from a developer tree...
-    insmod $LUSTRE/obdclass/llog_test.ko
-    grep -q llog_test /proc/modules && return
-    echo "Unable to load llog_test module!"
-    false
-    return
-}
-
-PATH=$(dirname $0):$LUSTRE/utils:$PATH
 TMP=${TMP:-/tmp}
 
 set -x
 MGS=$($LCTL dl | awk '/mgs/ { print $4 }')
 [ -z "$MGS" ] && echo "$0: SKIP: no MGS available, skipping llog test" && exit 0
 
-load_llog_test || exit 0
-$LCTL modules > $TMP/ogdb-$(hostname)
+load_module obdclass/llog_test || exit 1
+$LCTL modules > "$TMP/ogdb-$(hostname)"
 echo "NOW reload debugging syms.."
 
 RC=0
+
 # Using ignore_errors will allow lctl to cleanup even if the test fails.
 eval "$LCTL <<-EOF || RC=2
        attach llog_test llt_name llt_uuid
-       setup $MGS
-       device llt_name
        ignore_errors
-       cleanup
-       detach
+       setup $MGS
+       --device llt_name cleanup
+       --device llt_name detach
 EOF"
-rmmod -vw llog_test || RC2=3
-[ $RC -eq 0 -a "$RC2" ] && RC=$RC2
+
+$LCTL dl
+
+rmmod -v llog_test || RC2=3
+[ $RC -eq 0 ] && [ "$RC2" ] && RC=$RC2
 
 exit $RC