From b2f788f35518f32bfffa2f5f6cc31dafc0b29d28 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 10 Dec 2008 17:58:24 +0000
Subject: [PATCH] fix for new job_info struct
---
src/common/slurm_protocol_pack.c | 4 ++--
src/slurmctld/job_mgr.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index c7d70d27f69..0e8d55f3d4a 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -2280,6 +2280,7 @@ _unpack_job_info_members(job_info_t * job, Buf buffer)
char *node_inx_str;
multi_core_data_t *mc_ptr;
+ safe_unpack32(&job->assoc_id, buffer);
safe_unpack32(&job->job_id, buffer);
safe_unpack32(&job->user_id, buffer);
safe_unpack32(&job->group_id, buffer);
@@ -2289,7 +2290,6 @@ _unpack_job_info_members(job_info_t * job, Buf buffer)
safe_unpack16(&job->state_reason, buffer);
safe_unpack32(&job->alloc_sid, buffer);
- safe_unpack32(&job->assoc_id, buffer);
safe_unpack32(&job->time_limit, buffer);
safe_unpack_time(&job->submit_time, buffer);
@@ -2316,6 +2316,7 @@ _unpack_job_info_members(job_info_t * job, Buf buffer)
}
safe_unpackstr_xmalloc(&job->name, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&job->wckey, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&job->alloc_node, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&node_inx_str, &uint32_tmp, buffer);
if (node_inx_str == NULL)
@@ -2382,7 +2383,6 @@ _unpack_job_info_members(job_info_t * job, Buf buffer)
job->ntasks_per_core = mc_ptr->ntasks_per_core;
xfree(mc_ptr);
}
- safe_unpackstr_xmalloc(&job->wckey, &uint32_tmp, buffer);
return SLURM_SUCCESS;
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 7c4990c0722..c1c2f4a8033 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -3547,6 +3547,7 @@ void pack_job(struct job_record *dump_job_ptr, Buf buffer)
{
struct job_details *detail_ptr;
+ pack32(dump_job_ptr->assoc_id, buffer);
pack32(dump_job_ptr->job_id, buffer);
pack32(dump_job_ptr->user_id, buffer);
pack32(dump_job_ptr->group_id, buffer);
--
GitLab