From fa7e41615c486b504238e4b4540b0f65b0508b59 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 8 Dec 2005 19:18:01 +0000
Subject: [PATCH] remove "uid" from old_job_alloc_msg_t, no longer needed.
---
META | 2 +-
NEWS | 1 +
slurm/slurm.h.in | 1 -
src/api/allocate.c | 1 -
src/api/spawn.c | 1 -
src/common/slurm_protocol_pack.c | 2 --
src/srun/allocate.c | 2 --
7 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/META b/META
index be192729fac..14d4db6ddcb 100644
--- a/META
+++ b/META
@@ -12,6 +12,6 @@
Micro: 0
Version: 0.7.0
Release: 0.pre4
- API_CURRENT: 8
+ API_CURRENT: 9
API_AGE: 4
API_REVISION: 0
diff --git a/NEWS b/NEWS
index 249b2df4380..a830e9163ef 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ documents those changes that are of interest to users and admins.
slurm_allocation_lookup instead.
-- New API calls slurm_signal_job and slurm_signal_job_step to send
signals directly to the slurmds without triggering the shutdown sequence.
+ -- remove "uid" from old_job_alloc_msg_t, no longer needed.
* Changes in SLURM 0.7.0-pre4
=============================
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index 4e73f9a7f46..42df944b0ac 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -475,7 +475,6 @@ typedef struct node_info_msg {
typedef struct old_job_alloc_msg {
uint32_t job_id; /* job ID */
- uint32_t uid; /* user the job runs as */
} old_job_alloc_msg_t;
typedef struct partition_info {
diff --git a/src/api/allocate.c b/src/api/allocate.c
index c0dbafeadb0..cc48940fcb3 100644
--- a/src/api/allocate.c
+++ b/src/api/allocate.c
@@ -293,7 +293,6 @@ slurm_allocation_lookup(uint32_t jobid,
slurm_msg_t resp_msg;
req.job_id = jobid;
- req.uid = 0xdeadbeef; /* vestigial paramter ignored by the server */
req_msg.msg_type = REQUEST_OLD_JOB_RESOURCE_ALLOCATION;
req_msg.data = &req;
diff --git a/src/api/spawn.c b/src/api/spawn.c
index 51d958341bd..6f95d3503f9 100644
--- a/src/api/spawn.c
+++ b/src/api/spawn.c
@@ -117,7 +117,6 @@ slurm_step_ctx_create (job_step_create_request_msg_t *step_req)
resource_allocation_response_msg_t *alloc_resp = NULL;
old_job_req.job_id = step_req->job_id;
- old_job_req.uid = getuid();
if (slurm_confirm_allocation(&old_job_req, &alloc_resp) < 0)
return NULL;
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 2f4f50abd59..27557487289 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -2244,7 +2244,6 @@ _pack_old_job_desc_msg(old_job_alloc_msg_t * job_desc_ptr, Buf buffer)
{
/* load the data values */
pack32(job_desc_ptr->job_id, buffer);
- pack32(job_desc_ptr->uid, buffer);
}
static int
@@ -2260,7 +2259,6 @@ _unpack_old_job_desc_msg(old_job_alloc_msg_t **
/* load the data values */
safe_unpack32(&job_desc_ptr->job_id, buffer);
- safe_unpack32(&job_desc_ptr->uid, buffer);
return SLURM_SUCCESS;
unpack_error:
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index 3082456eaad..c40fbe48cc1 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -139,7 +139,6 @@ existing_allocation(void)
if ((job.job_id = jobid_from_env()) == 0)
return NULL;
- job.uid = getuid();
if (slurm_confirm_allocation(&job, &resp) < 0) {
if (opt.parallel_debug)
@@ -168,7 +167,6 @@ _wait_for_resources(resource_allocation_response_msg_t **resp)
info ("job %u queued and waiting for resources", r->job_id);
old.job_id = r->job_id;
- old.uid = (uint32_t) getuid();
slurm_free_resource_allocation_response_msg(r);
/* Keep polling until the job is allocated resources */
--
GitLab