From f93c36b96ad3a56628f32fbdb1b9b2f41b68596b Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 4 May 2011 09:51:37 -0700
Subject: [PATCH] Do not print error when job calls deallocate_nodes() with no
allocated nodes IF its resources have been merged into another job.
---
src/slurmctld/node_scheduler.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 8416f78ecc6..b4dde2bf072 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -290,8 +290,10 @@ extern void deallocate_nodes(struct job_record *job_ptr, bool timeout,
}
if (agent_args->node_count == 0) {
- error("Job %u allocated no nodes to be killed on",
- job_ptr->job_id);
+ if (job_ptr->details->expanding_jobid == 0) {
+ error("Job %u allocated no nodes to be killed on",
+ job_ptr->job_id);
+ }
xfree(kill_job->nodes);
select_g_select_jobinfo_free(kill_job->select_jobinfo);
xfree(kill_job);
--
GitLab