diff --git a/META b/META index be192729facc9e7cc1426e3be3083a023940ea67..14d4db6ddcb4e88be32e3377974f1046460e736c 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 249b2df43802a6a94a9ace5ad3716c2463caf07e..a830e9163efc06113841b63daf40ac49445bdce3 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 4e73f9a7f467e53cfa8ebd59246e3d096dfa5d89..42df944b0ac6018561a2525a378ab947a6f02226 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 c0dbafeadb070724829c99a6f7a7c9b727c65b84..cc48940fcb389950b554861d9018ef4b41884bd9 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 51d958341bd2307453b26690743862b6ff5ee647..6f95d3503f9dd4f9a7ed88352f5e2853e4b84252 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 2f4f50abd59bdd4aa1dd1de15f02803847bdceb2..27557487289f707a181730401f63768d2b1d7133 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 3082456eaad8bdde9ebe79a7cf94b75e6c697bed..c40fbe48cc1b40a3d8064dbd146e849a4934a9fb 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 */