From adb730b4c45caa97f905cbecd2936d6633be836a Mon Sep 17 00:00:00 2001
From: Albert Gil <albert.gil@schedmd.com>
Date: Thu, 23 May 2019 11:31:09 -0600
Subject: [PATCH] Fix packing pack_jobid in an sbcast.
After 1d66b39575585 18.08 and 17.11 are the same so we can just reuse the
18.08 block instead of making a new one.
Bug 7080
---
NEWS | 1 +
src/common/slurm_cred.c | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index e863e0218c5..371908e880a 100644
--- a/NEWS
+++ b/NEWS
@@ -53,6 +53,7 @@ documents those changes that are of interest to users and administrators.
testing a job's memory request.
-- Fix issue where multi-node job steps on cloud nodes wouldn't finish cleaning
up until the end of the job (rather than the end of the step).
+ -- Fix packing pack_jobid in an sbcast.
* Changes in Slurm 19.05.0rc1
=============================
diff --git a/src/common/slurm_cred.c b/src/common/slurm_cred.c
index 77fddcb81c4..243fcb29383 100644
--- a/src/common/slurm_cred.c
+++ b/src/common/slurm_cred.c
@@ -2235,10 +2235,11 @@ unpack_error:
static void _pack_sbcast_cred(sbcast_cred_t *sbcast_cred, Buf buffer,
uint16_t protocol_version)
{
- if (protocol_version >= SLURM_18_08_PROTOCOL_VERSION) {
+ if (protocol_version >= SLURM_19_05_PROTOCOL_VERSION) {
pack_time(sbcast_cred->ctime, buffer);
pack_time(sbcast_cred->expiration, buffer);
pack32(sbcast_cred->jobid, buffer);
+ pack32(sbcast_cred->pack_jobid, buffer);
pack32(sbcast_cred->uid, buffer);
pack32(sbcast_cred->gid, buffer);
packstr(sbcast_cred->user_name, buffer);
@@ -2481,10 +2482,11 @@ sbcast_cred_t *unpack_sbcast_cred(Buf buffer, uint16_t protocol_version)
uint32_t uint32_tmp;
sbcast_cred = xmalloc(sizeof(struct sbcast_cred));
- if (protocol_version >= SLURM_18_08_PROTOCOL_VERSION) {
+ if (protocol_version >= SLURM_19_05_PROTOCOL_VERSION) {
safe_unpack_time(&sbcast_cred->ctime, buffer);
safe_unpack_time(&sbcast_cred->expiration, buffer);
safe_unpack32(&sbcast_cred->jobid, buffer);
+ safe_unpack32(&sbcast_cred->pack_jobid, buffer);
safe_unpack32(&sbcast_cred->uid, buffer);
safe_unpack32(&sbcast_cred->gid, buffer);
safe_unpackstr_xmalloc(&sbcast_cred->user_name, &uint32_tmp,
--
GitLab