From: Niu Yawei <niu@whamcloud.com>
Date: Wed, 29 Aug 2012 02:45:16 +0000 (-0400)
Subject: LU-1798 test: check connect_flags for jobstats
X-Git-Tag: 2.2.95~20
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d82b844238f31daece4b857736f54f2a61b9dcd8;p=fs%2Flustre-release.git

LU-1798 test: check connect_flags for jobstats

Check connect_flags before enabling jobstats in the t-f.

Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: Ib36575fe7d08b257a2a7dda86851806bf44d7a41
Reviewed-on: http://review.whamcloud.com/3806
Tested-by: Hudson
Reviewed-by: Yu Jian <yujian@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

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