From 1a0a78d27ad1229a91d9646e2e11a7165fd23a93 Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Fri, 13 Jan 2017 01:48:29 -0500
Subject: [PATCH] Copy existing RPC section to 17.02 block in
_unpack_reserve_info_members().
---
src/common/slurm_protocol_pack.c | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index aebe2b2f67c..c253228c61a 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -5656,7 +5656,32 @@ _unpack_reserve_info_members(reserve_info_t * resv, Buf buffer,
char *node_inx_str = NULL;
uint32_t uint32_tmp;
- if (protocol_version >= SLURM_MIN_PROTOCOL_VERSION) {
+ if (protocol_version >= SLURM_17_02_PROTOCOL_VERSION) {
+ safe_unpackstr_xmalloc(&resv->accounts, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&resv->burst_buffer,&uint32_tmp, buffer);
+ safe_unpack32(&resv->core_cnt, buffer);
+ safe_unpack_time(&resv->end_time, buffer);
+ safe_unpackstr_xmalloc(&resv->features, &uint32_tmp, buffer);
+ safe_unpack32(&resv->flags, buffer);
+ safe_unpackstr_xmalloc(&resv->licenses, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&resv->name, &uint32_tmp, buffer);
+ safe_unpack32(&resv->node_cnt, buffer);
+ safe_unpackstr_xmalloc(&resv->node_list, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&resv->partition, &uint32_tmp, buffer);
+ safe_unpack32(&resv->resv_watts, buffer);
+ safe_unpack_time(&resv->start_time, buffer);
+
+ safe_unpackstr_xmalloc(&resv->tres_str, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&resv->users, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&node_inx_str, &uint32_tmp, buffer);
+ if (node_inx_str == NULL)
+ resv->node_inx = bitfmt2int("");
+ else {
+ resv->node_inx = bitfmt2int(node_inx_str);
+ xfree(node_inx_str);
+ node_inx_str = NULL;
+ }
+ } else if (protocol_version >= SLURM_MIN_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&resv->accounts, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&resv->burst_buffer,&uint32_tmp, buffer);
safe_unpack32(&resv->core_cnt, buffer);
--
GitLab