From 24687b601d1db4ce13ae8823a3e8cf0f3d7c1ed6 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 7 Aug 2017 15:06:27 -0600
Subject: [PATCH] Cosmetic changes, no changes to logic
---
doc/html/heterogeneous_jobs.shtml | 6 ++++--
src/common/slurm_protocol_pack.c | 8 ++++----
src/common/slurm_step_layout.c | 6 +++---
src/plugins/launch/runjob/launch_runjob.c | 6 +++---
src/slurmctld/step_mgr.c | 12 ++++++------
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/doc/html/heterogeneous_jobs.shtml b/doc/html/heterogeneous_jobs.shtml
index 9abfa57544f..e3d442f73a6 100644
--- a/doc/html/heterogeneous_jobs.shtml
+++ b/doc/html/heterogeneous_jobs.shtml
@@ -369,7 +369,9 @@ components of a heterogeneous job.</p>
<p>Heterogeneous jobs are not supported with Slurm's select/serial plugin.</p>
-<p>Heterogeneous jobs are not supported Cray ALPS systems.</p>
+<p>Heterogeneous jobs are not supported on Cray ALPS systems.</p>
+
+<p>Heterogeneous jobs are not supported on IBM PE systems.</p>
<h2><a name="sys_admin">System Administrator Information</a></h2>
@@ -443,6 +445,6 @@ especially other heterogeneous jobs.</p>
<p class="footer"><a href="#top">top</a></p>
-<p style="text-align:center;">Last modified 2 August 2017</p>
+<p style="text-align:center;">Last modified 7 August 2017</p>
<!--#include virtual="footer.txt"-->
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index f1a0a3456c7..d6f35c3fba4 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -4604,8 +4604,8 @@ pack_job_step_create_request_msg(job_step_create_request_msg_t * msg,
pack8(msg->no_kill, buffer);
pack8(msg->overcommit, buffer);
} else {
- error("pack_job_step_create_request_msg: protocol_version "
- "%hu not supported", protocol_version);
+ error("%s: protocol_version %hu not supported",
+ __func__, protocol_version);
}
}
@@ -4737,8 +4737,8 @@ unpack_job_step_create_request_msg(job_step_create_request_msg_t ** msg,
safe_unpack8(&(tmp_ptr->no_kill), buffer);
safe_unpack8(&(tmp_ptr->overcommit), buffer);
} else {
- error("unpack_job_step_create_request_msg: protocol_version "
- "%hu not supported", protocol_version);
+ error("%s: protocol_version %hu not supported",
+ __func__, protocol_version);
goto unpack_error;
}
diff --git a/src/common/slurm_step_layout.c b/src/common/slurm_step_layout.c
index a395ec7d829..120f3d0cc21 100644
--- a/src/common/slurm_step_layout.c
+++ b/src/common/slurm_step_layout.c
@@ -204,7 +204,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
-/* copys structure for step layout */
+/* copies structure for step layout */
extern slurm_step_layout_t *slurm_step_layout_copy(
slurm_step_layout_t *step_layout)
{
@@ -259,8 +259,8 @@ extern void pack_slurm_step_layout(slurm_step_layout_t *step_layout,
buffer);
}
} else {
- error("pack_slurm_step_layout: protocol_version "
- "%hu not supported", protocol_version);
+ error("%s: protocol_version %hu not supported",
+ __func__, protocol_version);
}
}
diff --git a/src/plugins/launch/runjob/launch_runjob.c b/src/plugins/launch/runjob/launch_runjob.c
index 471c3bd44b3..519099a1f9b 100644
--- a/src/plugins/launch/runjob/launch_runjob.c
+++ b/src/plugins/launch/runjob/launch_runjob.c
@@ -483,13 +483,13 @@ extern int launch_p_step_launch(srun_job_t *job, slurm_step_io_fds_t *cio_fds,
pthread_join(msg_thread, NULL);
}
- return 0;
+ return SLURM_SUCCESS;
}
extern int launch_p_step_wait(srun_job_t *job, bool got_alloc, opt_t *opt_local,
- int pack_offset)
+ int pack_offset, uint32_t task_offset)
{
- return 0;
+ return SLURM_SUCCESS;
}
extern int launch_p_step_terminate(void)
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index adda70e7703..0c5bbca858e 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -2261,8 +2261,8 @@ step_create(job_step_create_request_msg_t *step_specs,
return ESLURM_ACCESS_DENIED ;
if (batch_step) {
- info("user %u attempting to run batch script within "
- "an existing job", step_specs->user_id);
+ info("user %u attempting to run batch script within existing job %u",
+ step_specs->user_id, step_specs->job_id);
/* This seems hazardous to allow, but LSF seems to
* work this way, so don't treat it as an error. */
}
@@ -2673,8 +2673,8 @@ extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
if (step_ptr->pn_min_memory && _is_mem_resv() &&
((job_resrcs_ptr->memory_allocated == NULL) ||
(job_resrcs_ptr->memory_used == NULL))) {
- error("step_layout_create: lack memory allocation details "
- "to enforce memory limits for job %u", job_ptr->job_id);
+ error("%s: lack memory allocation details to enforce memory limits for job %u",
+ __func__, job_ptr->job_id);
step_ptr->pn_min_memory = 0;
} else if (step_ptr->pn_min_memory == MEM_PER_CPU)
step_ptr->pn_min_memory = 0; /* clear MEM_PER_CPU flag */
@@ -2735,7 +2735,7 @@ extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
if (pos == -1)
return NULL;
if (pos >= job_resrcs_ptr->nhosts)
- fatal("step_layout_create: node index bad");
+ fatal("%s: node index bad", __func__);
cpus = job_resrcs_ptr->cpus[pos];
cpus_used = job_resrcs_ptr->cpus_used[pos];
@@ -2830,7 +2830,7 @@ extern slurm_step_layout_t *step_layout_create(struct step_record *step_ptr,
step_ptr->step_id);
usable_cpus = MIN(usable_cpus, gres_cpus);
if (usable_cpus <= 0) {
- error("step_layout_create no usable cpus");
+ error("%s: no usable CPUs", __func__);
return NULL;
}
debug3("step_layout cpus = %d pos = %d",
--
GitLab