From 97b4b1aab2dd7b42f81623785f2af4b68e445216 Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Fri, 13 Jan 2017 01:42:03 -0500
Subject: [PATCH] Make a copy of the 16.05 RPC format for _pack_resv() as
17.02.
Make it easier to see the 17.02 changes as they are added in.
---
src/slurmctld/reservation.c | 39 ++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index bdd9fc15250..eb9eebc6cbe 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -1503,7 +1503,44 @@ static void _pack_resv(slurmctld_resv_t *resv_ptr, Buf buffer,
end_relative = resv_ptr->end_time;
}
- if (protocol_version >= SLURM_16_05_PROTOCOL_VERSION) {
+ if (protocol_version >= SLURM_17_02_PROTOCOL_VERSION) {
+ packstr(resv_ptr->accounts, buffer);
+ packstr(resv_ptr->burst_buffer, buffer);
+ pack32(resv_ptr->core_cnt, buffer);
+ pack_time(end_relative, buffer);
+ packstr(resv_ptr->features, buffer);
+ pack32(resv_ptr->flags, buffer);
+ packstr(resv_ptr->licenses, buffer);
+ packstr(resv_ptr->name, buffer);
+ pack32(resv_ptr->node_cnt, buffer);
+ packstr(resv_ptr->node_list, buffer);
+ packstr(resv_ptr->partition, buffer);
+ pack32(resv_ptr->resv_watts, buffer);
+ pack_time(start_relative, buffer);
+ packstr(resv_ptr->tres_fmt_str, buffer);
+ packstr(resv_ptr->users, buffer);
+
+ if (internal) {
+ pack8(resv_ptr->account_not, buffer);
+ packstr(resv_ptr->assoc_list, buffer);
+ /* NOTE: Restoring core_bitmap directly only works if
+ * the system's node and core counts don't change.
+ * core_resrcs is used so configuration changes can be
+ * supported */
+ _set_core_resrcs(resv_ptr);
+ pack_job_resources(resv_ptr->core_resrcs, buffer,
+ protocol_version);
+ pack32(resv_ptr->duration, buffer);
+ pack8(resv_ptr->full_nodes, buffer);
+ pack32(resv_ptr->resv_id, buffer);
+ pack_time(resv_ptr->start_time_prev, buffer);
+ pack_time(resv_ptr->start_time, buffer);
+ packstr(resv_ptr->tres_str, buffer);
+ pack8(resv_ptr->user_not, buffer);
+ } else {
+ pack_bit_fmt(resv_ptr->node_bitmap, buffer);
+ }
+ } else if (protocol_version >= SLURM_16_05_PROTOCOL_VERSION) {
packstr(resv_ptr->accounts, buffer);
packstr(resv_ptr->burst_buffer, buffer);
pack32(resv_ptr->core_cnt, buffer);
--
GitLab