LU-1661 tests: improve setup_posix_users()

[fs/lustre-release.git] / lustre / tests / test-framework.sh

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 7974cee..ad29a3e 100644 (file)
--- 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 () {
@@ -4221,6 +4242,63 @@ setstripe_nfsserver () {
     do_nodev $nfsserver lfs setstripe "$@"
 }
 
+# Check and add a test group.
+add_group() {
+       local group_id=$1
+       local group_name=$2
+       local rc=0
+
+       local gid=$(getent group $group_name | cut -d: -f3)
+       if [[ -n "$gid" ]]; then
+               [[ "$gid" -eq "$group_id" ]] || {
+                       error_noexit "inconsistent group ID:" \
+                                    "new: $group_id, old: $gid"
+                       rc=1
+               }
+       else
+               groupadd -g $group_id $group_name
+               rc=${PIPESTATUS[0]}
+       fi
+
+       return $rc
+}
+
+# Check and add a test user.
+add_user() {
+       local user_id=$1
+       shift
+       local user_name=$1
+       shift
+       local group_name=$1
+       shift
+       local home=$1
+       shift
+       local opts="$@"
+       local rc=0
+
+       local uid=$(getent passwd $user_name | cut -d: -f3)
+       if [[ -n "$uid" ]]; then
+               if [[ "$uid" -eq "$user_id" ]]; then
+                       local dir=$(getent passwd $user_name | cut -d: -f6)
+                       if [[ "$dir" != "$home" ]]; then
+                               mkdir -p $home
+                               usermod -d $home $user_name
+                               rc=${PIPESTATUS[0]}
+                       fi
+               else
+                       error_noexit "inconsistent user ID:" \
+                                    "new: $user_id, old: $uid"
+                       rc=1
+               fi
+       else
+               mkdir -p $home
+               useradd -M -u $user_id -d $home -g $group_name $opts $user_name
+               rc=${PIPESTATUS[0]}
+       fi
+
+       return $rc
+}
+
 check_runas_id_ret() {
     local myRC=0
     local myRUNAS_UID=$1