From ac864b8a1984aa5ba12bdafc1e60cc7c153c25d7 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 6 Apr 2006 22:08:20 +0000
Subject: [PATCH] svn merge -r7640:7725
https://eris.llnl.gov/svn/slurm/branches/slurm-1.0 Note: Changes to
accounting software from Andy Riebs in requeue.patch were not applied since
the sofware was completely re-written in version 1.1, but some documentation
changes were made and updates for AIX tests.
---
NEWS | 5 +++++
doc/man/man1/sacct.1 | 3 +++
testsuite/expect/globals.example | 1 +
testsuite/expect/test1.52 | 4 ++--
testsuite/expect/test11.1 | 3 +--
testsuite/expect/test11.2 | 7 +++----
testsuite/expect/test11.3 | 3 +--
testsuite/expect/test11.4 | 3 +--
testsuite/expect/test11.7 | 7 +++----
9 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/NEWS b/NEWS
index b95ba7425e8..350eacc6da6 100644
--- a/NEWS
+++ b/NEWS
@@ -70,6 +70,11 @@ documents those changes that are of interest to users and admins.
-- Remove some use of cr_enabled flag in slurmctld job record, use
new flag "test_only" in select_g_job_test() instead.
+* Changes in SLURM 1.0.10
+=========================
+ -- Fix for job accounting logic submitted from Andy Riebs to handle issues
+ with suspending jobs and such. patch file named requeue.patch
+
* Changes in SLURM 1.0.9
========================
-- Fix job accounting logic to open new log file on slurmctld reconfig.
diff --git a/doc/man/man1/sacct.1 b/doc/man/man1/sacct.1
index 1a770005702..b3c5ad28f70 100644
--- a/doc/man/man1/sacct.1
+++ b/doc/man/man1/sacct.1
@@ -302,6 +302,9 @@ cancelled
\f3cd\fP
completed
.TP
+\f3pd\fP
+pending
+.TP
\f3f\fP
failed
.TP
diff --git a/testsuite/expect/globals.example b/testsuite/expect/globals.example
index d3fac219385..2535af3d431 100755
--- a/testsuite/expect/globals.example
+++ b/testsuite/expect/globals.example
@@ -52,6 +52,7 @@ set use_pmi 0
set xcpu_dir "/mnt/xcpu"
set poe "/usr/bin/poe"
+set poe_partition "pdebug"
set mpirun "mpirun"
set totalviewcli "/usr/local/bin/totalviewcli"
diff --git a/testsuite/expect/test1.52 b/testsuite/expect/test1.52
index e4db7a5fd41..ef9b760a57e 100755
--- a/testsuite/expect/test1.52
+++ b/testsuite/expect/test1.52
@@ -54,14 +54,14 @@ if { ![file exists $poe] } {
}
#find out if we have enough nodes to test functionality
-spawn $scontrol show partition
+spawn $scontrol show partition $poe_partition
expect {
-re "TotalNodes=($number)" {
set node_count $expect_out(1,string)
if { $node_count < 2 } {
send_user "WARNING: system must have at least 2 \
nodes to run this test on. This system \
- only has 2.\n"
+ only has $node_count.\n"
exit $exit_code
}
exp_continue
diff --git a/testsuite/expect/test11.1 b/testsuite/expect/test11.1
index 1eac7e9e8c2..28ec0d1dc86 100755
--- a/testsuite/expect/test11.1
+++ b/testsuite/expect/test11.1
@@ -35,7 +35,6 @@
source ./globals
set test_id "11.1"
-set partition "debug"
set env(SLURM_LL_API_DEBUG) "2"
set exit_code 0
set num_nodes 1
@@ -56,7 +55,7 @@ if { ![file exists $poe] } {
#
# execute poe with a specific node count
#
-spawn $poe hostname -resd yes -rmpool $partition -procs \
+spawn $poe hostname -rmpool $poe_partition -procs \
$num_tasks -nodes $num_nodes -retry wait
expect {
-re "LL_StepNodeCount = ($number)" {
diff --git a/testsuite/expect/test11.2 b/testsuite/expect/test11.2
index 15ab3eb77e2..14e1ef02fe9 100755
--- a/testsuite/expect/test11.2
+++ b/testsuite/expect/test11.2
@@ -35,7 +35,6 @@
source ./globals
set test_id "11.2"
-set partition "debug"
set env(SLURM_LL_API_DEBUG) "2"
set exit_code 0
set mode "us"
@@ -56,7 +55,7 @@ if { ![file exists $poe] } {
#
# execute poe with a specific node count
#
-spawn $poe hostname -resd yes -rmpool $partition\
+spawn $poe hostname -rmpool $poe_partition\
-euidevice $device -retry wait
expect {
@@ -87,7 +86,7 @@ got '$found_device'\n"
#
# execute poe with a specific node count
#
-spawn $poe hostname -resd yes -rmpool $partition -euilib $mode -retry wait
+spawn $poe hostname -rmpool $poe_partition -euilib $mode -retry wait
expect {
-re "LL_AdapterUsageMode = ($alpha_numeric)" {
@@ -118,7 +117,7 @@ set found_device ""
#
# execute poe with a specific node count
#
-spawn $poe hostname -resd yes -rmpool $partition -euilib $mode\
+spawn $poe hostname -rmpool $poe_partition -euilib $mode\
-euidevice $device -retry wait
expect {
diff --git a/testsuite/expect/test11.3 b/testsuite/expect/test11.3
index bb046c93438..691ce190ff4 100755
--- a/testsuite/expect/test11.3
+++ b/testsuite/expect/test11.3
@@ -35,7 +35,6 @@
source ./globals
set test_id "11.3"
-set partition "debug"
set env(SLURM_LL_API_DEBUG) "2"
set exit_code 0
set job_id 0
@@ -57,7 +56,7 @@ foreach proto $protocols {
#
incr protos
set found 0
- spawn $poe hostname -resd yes -rmpool $partition -msg_api $proto\
+ spawn $poe hostname -rmpool $poe_partition -msg_api $proto\
-euilib us -retry wait
expect {
-re "LL_AdapterUsageProtocol = ($alpha_numeric_under)" {
diff --git a/testsuite/expect/test11.4 b/testsuite/expect/test11.4
index ffbc55e91ff..884cc4b6715 100755
--- a/testsuite/expect/test11.4
+++ b/testsuite/expect/test11.4
@@ -34,7 +34,6 @@
source ./globals
set test_id "11.4"
-set partition "debug"
set env(SLURM_LL_API_DEBUG) "2"
set exit_code 0
set job_id 0
@@ -57,7 +56,7 @@ if { ![file exists mpi-testscripts/allred] } {
#
# execute poe with a an mpi script
#
-spawn $poe $script -resd yes -rmpool $partition -nodes 2 -procs 2\
+spawn $poe $script -rmpool $poe_partition -nodes 2 -procs 2\
-euilib us -retry wait
expect {
-nocase "passed" {
diff --git a/testsuite/expect/test11.7 b/testsuite/expect/test11.7
index b6c2f37f96a..8ce01dc37b8 100755
--- a/testsuite/expect/test11.7
+++ b/testsuite/expect/test11.7
@@ -34,7 +34,6 @@
source ./globals
set test_id "11.7"
-set partition "debug"
set exit_code 0
set env(SLURM_LL_API_DEBUG) "2"
set num_nodes 2
@@ -55,7 +54,7 @@ if { ![file exists $poe] } {
}
#find out if we have enough nodes to test functionality
-spawn $scontrol show partition
+spawn $scontrol show partition $poe_partition
expect {
-re "TotalNodes=($number)" {
set node_count $expect_out(1,string)
@@ -90,14 +89,14 @@ for {set i 0} {$i<2} {incr i} {
set file [open $hostfile "w"]
puts $file "$node1\n$node0"
close $file
- spawn $poe $bin_hostname -resd yes -rmpool $partition -procs \
+ spawn $poe $bin_hostname -rmpool $poe_partition -procs \
$num_tasks -nodes $num_nodes -retry wait \
-hostfile $hostfile
} else {
#
# execute poe with a specific node count
#
- spawn $poe $bin_hostname -resd yes -rmpool $partition -procs \
+ spawn $poe $bin_hostname -rmpool $poe_partition -procs \
$num_tasks -nodes $num_nodes -retry wait
}
expect {
--
GitLab