From bbb7b0b2890c3b9947a3fa59d4ffa8504ee53e95 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 24 Feb 2014 16:39:47 -0800
Subject: [PATCH] Remove reservation flags from job structure
This information was never used and has been eliminated
---
src/slurmctld/job_mgr.c | 9 +++------
src/slurmctld/reservation.c | 4 +---
src/slurmctld/slurmctld.h | 1 -
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index df8e6db58b4..b8a79956cda 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -824,7 +824,6 @@ static void _dump_job_state(struct job_record *dump_job_ptr, Buf buffer)
pack16(dump_job_ptr->mail_type, buffer);
pack16(dump_job_ptr->state_reason, buffer);
pack16(dump_job_ptr->restart_cnt, buffer);
- pack16(dump_job_ptr->resv_flags, buffer);
pack16(dump_job_ptr->wait_all_nodes, buffer);
pack16(dump_job_ptr->warn_flags, buffer);
pack16(dump_job_ptr->warn_signal, buffer);
@@ -920,7 +919,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
uint16_t job_state, details, batch_flag, step_flag;
uint16_t kill_on_node_fail, direct_set_prio;
uint16_t alloc_resp_port, other_port, mail_type, state_reason;
- uint16_t restart_cnt, resv_flags, ckpt_interval;
+ uint16_t restart_cnt, ckpt_interval;
uint16_t wait_all_nodes, warn_flags = 0, warn_signal, warn_time;
uint16_t limit_set_max_cpus = 0, limit_set_max_nodes = 0;
uint16_t limit_set_min_cpus = 0, limit_set_min_nodes = 0;
@@ -1003,7 +1002,6 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
safe_unpack16(&mail_type, buffer);
safe_unpack16(&state_reason, buffer);
safe_unpack16(&restart_cnt, buffer);
- safe_unpack16(&resv_flags, buffer);
safe_unpack16(&wait_all_nodes, buffer);
safe_unpack16(&warn_flags, buffer);
safe_unpack16(&warn_signal, buffer);
@@ -1167,7 +1165,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
safe_unpack16(&mail_type, buffer);
safe_unpack16(&state_reason, buffer);
safe_unpack16(&restart_cnt, buffer);
- safe_unpack16(&resv_flags, buffer);
+ safe_unpack16(&uint16_tmp, buffer); /* Was resv_flags */
safe_unpack16(&wait_all_nodes, buffer);
safe_unpack16(&warn_signal, buffer);
safe_unpack16(&warn_time, buffer);
@@ -1325,7 +1323,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
safe_unpack16(&mail_type, buffer);
safe_unpack16(&state_reason, buffer);
safe_unpack16(&restart_cnt, buffer);
- safe_unpack16(&resv_flags, buffer);
+ safe_unpack16(&uint16_tmp, buffer); /* Was resv_flags */
safe_unpack16(&wait_all_nodes, buffer);
safe_unpack16(&warn_signal, buffer);
safe_unpack16(&warn_time, buffer);
@@ -1534,7 +1532,6 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
job_ptr->resv_id = resv_id;
job_ptr->resv_name = resv_name;
resv_name = NULL; /* reused, nothing left to free */
- job_ptr->resv_flags = resv_flags;
job_ptr->select_jobinfo = select_jobinfo;
job_ptr->job_resrcs = job_resources;
job_ptr->spank_job_env = spank_job_env;
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index 536ce123520..8d0c4224363 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -2897,7 +2897,7 @@ extern int load_all_resv_state(int recover)
/*
* Determine if a job request can use the specified reservations
*
- * IN/OUT job_ptr - job to validate, set its resv_id and resv_flags
+ * IN/OUT job_ptr - job to validate, set its resv_id
* RET SLURM_SUCCESS or error code (not found or access denied)
*/
extern int validate_job_resv(struct job_record *job_ptr)
@@ -2910,7 +2910,6 @@ extern int validate_job_resv(struct job_record *job_ptr)
if ((job_ptr->resv_name == NULL) || (job_ptr->resv_name[0] == '\0')) {
xfree(job_ptr->resv_name);
job_ptr->resv_id = 0;
- job_ptr->resv_flags = 0;
job_ptr->resv_ptr = NULL;
return SLURM_SUCCESS;
}
@@ -2929,7 +2928,6 @@ extern int validate_job_resv(struct job_record *job_ptr)
rc = _valid_job_access_resv(job_ptr, resv_ptr);
if (rc == SLURM_SUCCESS) {
job_ptr->resv_id = resv_ptr->resv_id;
- job_ptr->resv_flags = resv_ptr->flags;
job_ptr->resv_ptr = resv_ptr;
_validate_node_choice(resv_ptr);
}
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 9fd6c157261..30026e441c6 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -613,7 +613,6 @@ struct job_record {
uint32_t resv_id; /* reservation ID */
char *resv_name; /* reservation name */
struct slurmctld_resv *resv_ptr;/* reservation structure pointer */
- uint16_t resv_flags; /* see RESERVE_FLAG_* in slurm.h */
uint32_t requid; /* requester user ID */
char *resp_host; /* host for srun communications */
dynamic_plugin_data_t *select_jobinfo;/* opaque data, BlueGene */
--
GitLab