From 9da24b1638f9f940027623f4ffb514972e6a12b5 Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Tue, 28 Aug 2012 22:45:16 -0400 Subject: [PATCH] LU-1798 test: check connect_flags for jobstats Check connect_flags before enabling jobstats in the t-f. Signed-off-by: Niu Yawei Change-Id: Ib36575fe7d08b257a2a7dda86851806bf44d7a41 Reviewed-on: http://review.whamcloud.com/3806 Tested-by: Hudson Reviewed-by: Yu Jian Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/sanity.sh | 3 +++ lustre/tests/test-framework.sh | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index f434a8e..ca146f6 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -9050,6 +9050,9 @@ verify_jobstats() { } test_205() { # Job stats + [ -z "$(lctl get_param -n mdc.*.connect_flags | grep jobstats)" ] && + skip "Server doesn't support jobstats" && return 0 + local cmd OLD_JOBENV=`$LCTL get_param -n jobid_var` if [ $OLD_JOBENV != $JOBENV ]; then diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index ad29a3e..446724665 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -2915,7 +2915,9 @@ init_param_vars () { osc_ensure_active client $TIMEOUT local jobid_var - if [ $JOBSTATS_AUTO -ne 0 ]; then + if [ -z "$(lctl get_param -n mdc.*.connect_flags | grep jobstats)" ]; then + jobid_var="none" + elif [ $JOBSTATS_AUTO -ne 0 ]; then echo "enable jobstats, set job scheduler as $JOBID_VAR" jobid_var=$JOBID_VAR else -- 1.8.3.1