From: Niu Yawei <niu@whamcloud.com>
Date: Mon, 20 Aug 2012 05:52:11 +0000 (-0400)
Subject: LU-1763 test: enable jobstats by default
X-Git-Tag: 2.3.51~171
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=bfd4acbe0b197fdc6f6a040ee1360cdc56ceef07

LU-1763 test: enable jobstats by default

Enable jobstats in the auto-test by default.

Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: I03bd22b144f4372922c6dc67511d09a91d17b8e4
Reviewed-on: http://review.whamcloud.com/3718
Tested-by: Hudson
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 7974cee..70a4327 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -15,6 +15,8 @@ export GSS_KRB5=false
 export GSS_PIPEFS=false
 export IDENTITY_UPCALL=default
 export QUOTA_AUTO=1
+export JOBSTATS_AUTO=${JOBSTATS_AUTO:-1}
+export JOBID_VAR=${JOBID_VAR:-"procname_uid"}
 
 # LOAD_LLOOP: LU-409: only load llite_lloop module if kernel < 2.6.32 or
 #             LOAD_LLOOP is true. LOAD_LLOOP is false by default.
@@ -2904,25 +2906,44 @@ osc_ensure_active () {
 }
 
 init_param_vars () {
-    remote_mds_nodsh ||
-        TIMEOUT=$(do_facet $SINGLEMDS "lctl get_param -n timeout")
+	remote_mds_nodsh ||
+		TIMEOUT=$(do_facet $SINGLEMDS "lctl get_param -n timeout")
 
-    log "Using TIMEOUT=$TIMEOUT"
+	log "Using TIMEOUT=$TIMEOUT"
 
-    osc_ensure_active $SINGLEMDS $TIMEOUT
-    osc_ensure_active client $TIMEOUT
+	osc_ensure_active $SINGLEMDS $TIMEOUT
+	osc_ensure_active client $TIMEOUT
 
-	if [ $QUOTA_AUTO -ne 0 ]; then
-        if [ "$ENABLE_QUOTA" ]; then
-            echo "enable quota as required"
-            setup_quota $MOUNT || return 2
-        else
-            echo "disable quota as required"
-            $LFS quotaoff -ug $MOUNT > /dev/null 2>&1
-        fi
-    fi
+	local jobid_var
+	if [ $JOBSTATS_AUTO -ne 0 ]; then
+		echo "enable jobstats, set job scheduler as $JOBID_VAR"
+		jobid_var=$JOBID_VAR
+	else
+		jobid_var=`$LCTL get_param -n jobid_var`
+		if [ $jobid_var != "disable" ]; then
+			echo "disable jobstats as required"
+			jobid_var="disable"
+		else
+			jobid_var="none"
+		fi
+	fi
 
-    return 0
+	if [ $jobid_var == $JOBID_VAR -o $jobid_var == "disable" ]; then
+		do_facet mgs $LCTL conf_param $FSNAME.sys.jobid_var=$jobid_var
+		wait_update $HOSTNAME "$LCTL get_param -n jobid_var" \
+			$jobid_var || return 1
+	fi
+
+	if [ $QUOTA_AUTO -ne 0 ]; then
+		if [ "$ENABLE_QUOTA" ]; then
+			echo "enable quota as required"
+			setup_quota $MOUNT || return 2
+		else
+			echo "disable quota as required"
+			$LFS quotaoff -ug $MOUNT > /dev/null 2>&1
+		fi
+	fi
+	return 0
 }
 
 nfs_client_mode () {