Merge branch 'slurm-14.11'

NEWS

@@ -258,6 +258,8 @@ documents those changes that are of interest to users and administrators.
     value of MessageTimeout rather than 30 seconds.
  -- sshare -U/--Users only flag was used uninitialized.
  -- Cray systems, add "plugstack.conf.template" sample SPANK configuration file.
+ -- BLUEGENE - Set DB2NOEXITLIST when starting the slurmctld daemon to avoid
+    random crashing in db2 when the slurmctld is exiting.
 
 * Changes in Slurm 14.11.6
 ==========================

doc/html/team.shtml

@@ -134,6 +134,7 @@ Lead Slurm developers are:
 <li>Sam Lang</li>
 <li>Puenlap Lee (Bull)</li>
 <li>Dennis Leepow</li>
+<li>Veronique Legrand (Institut Pasteur, France)</li>
 <li>Olli-Pekka Lehto (CSC-IT Center for Science Ltd., Finland)</li>
 <li>Piotr Lesnicki (Bull)</li>
 <li>Bernard Li (Genome Sciences Centre, Canada)</li>

etc/init.d.slurm.in

@@ -30,6 +30,10 @@ CONFDIR="@sysconfdir@"
 LIBDIR="@libdir@"
 SBINDIR="@sbindir@"
 
+# On a bluegene system this will be set to '#'.
+# Yes, FALSE is the correct variable to look at in the .in script.
+HAVE_BG="@BLUEGENE_LOADED_FALSE@"
+
 # Source function library.
 if [ -f /etc/rc.status ]; then
    . /etc/rc.status
@@ -93,6 +97,15 @@ start() {
     shift
     echo -n "starting $prog: "
     unset HOME MAIL USER USERNAME
+
+
+    if [[ $HAVE_BG == "#" ]] && [[ $prog == slurmctld ]]
+    then
+	    # On bluegene systems this need to be set of DB2 can unexpectedly
+	    # crash when the slurmctld is exiting. (Bug 1597)
+	    export DB2NOEXITLIST=ON
+    fi
+
     $STARTPROC $SBINDIR/$prog $*
     rc_status -v
     echo

testsuite/expect/test12.4

@@ -72,7 +72,7 @@ expect {
 	}
 }
 
-spawn $bin_id -u
+spawn $bin_id -g
 expect {
 	 -re "($alpha_numeric_under)" {
 		set user_gid $expect_out(1,string)

testsuite/expect/test15.27

@@ -70,7 +70,7 @@ proc check_alloc { } {
 	}
 
 	# Wait a bit for sacct to populate
-	sleep 5
+	sleep 10
 
 	spawn $sacct --job=$job_id --allocation -oalloccpus --noheader
 	expect {

testsuite/expect/test33.1

@@ -88,14 +88,14 @@ proc run_config { test_config } {
 file delete $test_prog
 
 if {[test_aix]} {
-	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir}  ${build_dir}/src/api/libslurm.o  -ldl\n"
-	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir}  ${build_dir}/src/api/libslurm.o  -ldl
+	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl\n"
+	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl
 } elseif [file exists ${slurm_dir}/lib64/libslurm.so] {
-	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir}  ${build_dir}/src/api/libslurm.o  -ldl\n"
-	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir}  ${build_dir}/src/api/libslurm.o  -ldl
+	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl\n"
+	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl
 } else {
-	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir}  ${build_dir}/src/api/libslurm.o  -ldl\n"
-	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir}  ${build_dir}/src/api/libslurm.o  -ldl
+	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl\n"
+	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl
 }
 exec $bin_chmod 700 $test_prog