From 4f8fc17da3c14bc32d5e171d09a2e5d73dd3c8a2 Mon Sep 17 00:00:00 2001 From: Moe Jette <jette1@llnl.gov> Date: Tue, 9 Jul 2002 22:49:37 +0000 Subject: [PATCH] Remove some vestigial node states Preserve (allocated) state of nodes when config file is re-read (reconfig API) --- src/slurmctld/job_mgr.c | 8 +++++++- src/slurmctld/read_config.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c index f7149d10b1a..b7a649b4f47 100644 --- a/src/slurmctld/job_mgr.c +++ b/src/slurmctld/job_mgr.c @@ -1093,9 +1093,15 @@ reset_job_bitmaps () fatal ("dump_all_job: job integrity is bad"); if (job_record_point->node_bitmap) bit_free(job_record_point->node_bitmap); - if (job_record_point->nodes) + if (job_record_point->nodes) { node_name2bitmap (job_record_point->nodes, &job_record_point->node_bitmap); + if ( (job_record_point->job_state == JOB_STAGE_IN) || + (job_record_point->job_state == JOB_RUNNING) || + (job_record_point->job_state == JOB_STAGE_OUT) ) + allocate_nodes ( job_record_point->node_bitmap ) ; + + } if (job_record_point->details == NULL) continue; diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c index 378dec88694..add79be7756 100644 --- a/src/slurmctld/read_config.c +++ b/src/slurmctld/read_config.c @@ -20,8 +20,9 @@ #include <syslog.h> #include <unistd.h> -#include "slurmctld.h" -#include "list.h" +#include <src/common/list.h> +#include <src/common/macros.h> +#include <src/slurmctld/slurmctld.h> #define BUF_SIZE 1024 -- GitLab