From 2b75ee8c89b99200f3bb2691ad55fe778535b59a Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Mon, 8 May 2017 11:02:25 -0600
Subject: [PATCH] Revert "Clean up the bb allocation that happened when we ran
bb_g_job_begin when"
This reverts commit e87edf8d3ac9d407fdddf6fc8aef1849162f45f9.
Per Moe's suggestion, we revert this sense it most likely isn't totally
correct.
---
src/slurmctld/node_scheduler.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index ac7fdf545b2..a99386733f5 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -2572,10 +2572,6 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
if (select_g_job_begin(job_ptr) != SLURM_SUCCESS) {
/* Leave job queued, something is hosed */
error("select_g_job_begin(%u): %m", job_ptr->job_id);
-
- /* Since we began the job earlier we have to cancel it */
- (void) bb_g_job_cancel(job_ptr);
-
error_code = ESLURM_NODES_BUSY;
job_ptr->start_time = 0;
job_ptr->time_last_active = 0;
@@ -2595,10 +2591,6 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
error("Select plugin failed to set job resources, nodes");
/* Do not attempt to allocate the select_bitmap nodes since
* select plugin failed to set job resources */
-
- /* Since we began the bb job earlier we have to cancel it */
- (void) bb_g_job_cancel(job_ptr);
-
error_code = ESLURM_NODES_BUSY;
job_ptr->start_time = 0;
job_ptr->time_last_active = 0;
@@ -2618,11 +2610,6 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
if (!job_ptr->job_resrcs) {
/* If we don't exit earlier the empty job_resrcs might
* be dereferenced later */
-
- /* Since we began the bb job earlier we have to cancel
- * it */
- (void) bb_g_job_cancel(job_ptr);
-
error_code = ESLURM_NODES_BUSY;
job_ptr->start_time = 0;
job_ptr->time_last_active = 0;
--
GitLab