From 7e2daafe6c0fc9580616821e96b1e75ebf30d254 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 17 Oct 2008 21:54:01 +0000
Subject: [PATCH] svn merge -r15445:15449
https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
---
src/slurmd/slurmd/req.c | 2 ++
src/squeue/opts.c | 6 +++++-
testsuite/expect/test15.25 | 6 +++---
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index 377007a40f8..564ffdd7966 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -1069,6 +1069,8 @@ _rpc_batch_job(slurm_msg_t *msg)
if (slurm_cred_revoked(conf->vctx, req->cred)) {
info("Job %u killed while launch was in progress",
req->job_id);
+ sleep(1); /* give slurmstepd time to create
+ * the communication socket */
_terminate_all_steps(req->job_id, true);
rc = ESLURMD_CREDENTIAL_REVOKED;
goto done;
diff --git a/src/squeue/opts.c b/src/squeue/opts.c
index db18c23953e..956ee5832b7 100644
--- a/src/squeue/opts.c
+++ b/src/squeue/opts.c
@@ -726,7 +726,11 @@ _print_options()
uint32_t *job_id;
char hostlist[8192];
- hostset_ranged_string (params.nodes, sizeof(hostlist)-1, hostlist);
+ if (params.nodes) {
+ hostset_ranged_string(params.nodes, sizeof(hostlist)-1,
+ hostlist);
+ } else
+ hostlist[0] = '\0';
printf( "-----------------------------\n" );
printf( "all = %s\n", params.all_flag ? "true" : "false");
diff --git a/testsuite/expect/test15.25 b/testsuite/expect/test15.25
index aacd287ac26..7b18ba289b7 100755
--- a/testsuite/expect/test15.25
+++ b/testsuite/expect/test15.25
@@ -50,7 +50,7 @@ if {[test_account_storage]} {
}
global env
-set env(SALLOC_ACCOUNT) QA_ACCT
+set env(SALLOC_ACCOUNT) $job_acct
#
# Build input script file
@@ -61,7 +61,7 @@ make_bash_script $file_in "$bin_sleep 10"
# Spawn a srun batch job that just sleeps for a while
#
set timeout $max_job_delay
-set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --account=MY_ACCT -t1 $file_in]
+set sbatch_pid [spawn $sbatch --output=/dev/null --error=/dev/null --account=$job_acct -t1 $file_in]
expect {
-re "Submitted batch job ($number)" {
set job_id1 $expect_out(1,string)
@@ -118,7 +118,7 @@ if {$match_acct == 0} {
set match_acct 0
spawn $scontrol show job $job_id2
expect {
- -re "Account=QA_ACCT" {
+ -re "Account=$job_acct" {
set match_acct 1
exp_continue
}
--
GitLab