Page MenuHomeFreeBSD
Files F154603228

D52143.id160912.diff
No OneTemporary
Actions

D52143.id160912.diff
View Options

diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -122,6 +122,31 @@
.include <bsd.port.options.mk>
+post-extract:
+ @${MKDIR} ${WRKSRC}/src/plugins/task/pgid
+ @${CP} ${FILESDIR}/extra-pgid/task_pgid.c ${WRKSRC}/src/plugins/task/pgid/
+
+ # Use an existing plugin's Makefile.in as a template
+ @${CP} ${WRKSRC}/src/plugins/task/cray_aries/Makefile.in ${WRKSRC}/src/plugins/task/pgid/Makefile.in
+
+ # Rename everything from task_cray_aries -> task_pgid and its source file to task_pgid.c
+ @${REINPLACE_CMD} -e 's/task_cray_aries/task_pgid/g' \
+ -e 's/cray_aries\.c/task_pgid.c/g' \
+ ${WRKSRC}/src/plugins/task/pgid/Makefile.in
+ @${REINPLACE_CMD} -e 's|^task_pgid_la_SOURCES = .*|task_pgid_la_SOURCES = task_pgid.c\ntask_pgid_la_CPPFLAGS = $$(AM_CPPFLAGS) -I$$(top_srcdir)/src/plugins/task -I$$(top_srcdir)/src/slurmd -I$$(top_srcdir)/src/slurmd/slurmstepd|' \
+ ${WRKSRC}/src/plugins/task/pgid/Makefile.in
+ @${REINPLACE_CMD} -e 's|^task_pgid_la_LIBADD[[:space:]]*=.*|task_pgid_la_LIBADD = $$(top_builddir)/src/api/libslurmfull.la|' \
+ ${WRKSRC}/src/plugins/task/pgid/Makefile.in
+ @${REINPLACE_CMD} 's|^AM_CPPFLAGS[[:space:]]*=.*|& -I$$(top_srcdir)/src/interfaces -I$$(top_srcdir)/src/plugins/task -I$$(top_srcdir)/src/slurmd -I$$(top_srcdir)/src/slurmd/slurmstepd|' \
+ ${WRKSRC}/src/plugins/task/pgid/Makefile.in
+
+post-patch:
+ @${ECHO_CMD} "Inserting pgid Makefile into configure (single-line ac_config_files)"
+ @${REINPLACE_CMD} -E \
+ 's,(ac_config_files="[^"]*src/plugins/task/(cray_aries|cgroup|affinity)/Makefile),\1 src/plugins/task/pgid/Makefile,' \
+ ${WRKSRC}/configure
+ @${CHMOD} +x ${WRKSRC}/configure
+
# Hack around nonfunctional --disable-gtktest flag
pre-configure-GUI-off:
${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
diff --git a/sysutils/slurm-wlm/files/extra-pgid/task_pgid.c b/sysutils/slurm-wlm/files/extra-pgid/task_pgid.c
new file mode 100644
--- /dev/null
+++ b/sysutils/slurm-wlm/files/extra-pgid/task_pgid.c
@@ -0,0 +1,153 @@
+#include "slurm_xlator.h"
+#include "log.h"
+#include "xmalloc.h"
+#include "task.h" /* interface declarations */
+
+/* these two pull in batch_job_launch_msg_t, launch_tasks_request_msg_t,
+ stepd_step_task_info_t, etc. */
+#include "src/common/slurm_protocol_api.h"
+#include "src/slurmd/slurmstepd/slurmstepd_job.h"
+
+#include <sys/types.h>
+#include <signal.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+
+/* Required plugin identifiers (exported) */
+__attribute__((visibility("default"))) const char plugin_name[] = "PGID task plugin for FreeBSD";
+__attribute__((visibility("default"))) const char plugin_type[] = "task/pgid";
+__attribute__((visibility("default"))) const uint32_t plugin_version = SLURM_VERSION_NUMBER;
+
+/* Required generic plugin entry points */
+int init(void) { slurm_info("task/pgid: init"); return SLURM_SUCCESS; }
+int fini(void) { slurm_info("task/pgid: fini"); return SLURM_SUCCESS; }
+
+static pid_t job_pgid = -1;
+
+/* ==== Required task_* API (must all be present) ==== */
+
+/* Called when slurmd receives a batch launch request */
+int task_p_slurmd_batch_request(batch_job_launch_msg_t *req)
+{
+ (void)req;
+ return SLURM_SUCCESS;
+}
+
+/* Called when slurmd receives a general launch request */
+int task_p_slurmd_launch_request(launch_tasks_request_msg_t *req,
+ uint32_t node_id, char **err_msg)
+{
+ (void)req; (void)node_id; (void)err_msg;
+ return SLURM_SUCCESS;
+}
+
+int task_p_slurmd_suspend_job(uint32_t job_id)
+{
+ (void)job_id;
+ return SLURM_SUCCESS;
+}
+
+int task_p_slurmd_resume_job(uint32_t job_id)
+{
+ (void)job_id;
+ return SLURM_SUCCESS;
+}
+
+/* Before setuid to the job user */
+int task_p_pre_setuid(stepd_step_rec_t *step)
+{
+ (void)step;
+ return SLURM_SUCCESS;
+}
+
+/* Called in privileged context before launch */
+int task_p_pre_launch_priv(stepd_step_rec_t *step,
+ uint32_t node_tid, uint32_t global_tid)
+{
+ (void)step; (void)node_tid; (void)global_tid;
+ return SLURM_SUCCESS;
+}
+
+int task_p_pre_launch(stepd_step_rec_t *step)
+{
+ pid_t cur = getpid();
+
+ /* Case A: no PGID recorded yet for this step -> become the group leader */
+ if (step->pgid <= 0) {
+ if (setpgid(0, 0) < 0) {
+ /* If a sibling beat us to it, join that PGID instead */
+ if (errno == EACCES || errno == EPERM || errno == EEXIST) {
+ /* Someone created a group already; query our pgid and store it */
+ pid_t pg = getpgid(0);
+ if (pg < 0) {
+ slurm_error("task/pgid: getpgid failed after race: %s", strerror(errno));
+ return SLURM_ERROR;
+ }
+ step->pgid = pg;
+ slurm_debug("task/pgid: joined existing PGID %d (race)", step->pgid);
+ return SLURM_SUCCESS;
+ }
+ slurm_error("task/pgid: setpgid(0,0) failed for leader pid=%d: %s", (int)cur, strerror(errno));
+ return SLURM_ERROR;
+ }
+ step->pgid = getpgid(0);
+ if (step->pgid < 0) {
+ slurm_error("task/pgid: getpgid failed after creating group: %s", strerror(errno));
+ return SLURM_ERROR;
+ }
+ slurm_debug("task/pgid: created step PGID %d (leader pid=%d)", step->pgid, (int)cur);
+ return SLURM_SUCCESS;
+ }
+
+ /* Case B: PGID exists -> join it */
+ if (setpgid(0, step->pgid) < 0) {
+ /* ESRCH: parent/leader not visible yet; tiny retry helps on fast forks */
+ if (errno == ESRCH) {
+ usleep(1000); /* 1 ms backoff */
+ if (setpgid(0, step->pgid) == 0) {
+ slurm_debug("task/pgid: joined PGID %d after retry", step->pgid);
+ return SLURM_SUCCESS;
+ }
+ }
+ slurm_error("task/pgid: setpgid(0,%d) failed: %s", step->pgid, strerror(errno));
+ return SLURM_ERROR;
+ }
+ slurm_debug("task/pgid: joined existing PGID %d", step->pgid);
+ return SLURM_SUCCESS;
+}
+
+/* After a task terminates */
+int task_p_post_term(stepd_step_rec_t *step, stepd_step_task_info_t *task)
+{
+ (void)step; (void)task;
+ return SLURM_SUCCESS;
+}
+
+/* After the whole step finishes */
+int task_p_post_step(stepd_step_rec_t *step)
+{
+ (void)step;
+ return SLURM_SUCCESS;
+}
+
+/* Allow plugin to track additional PIDs if needed */
+int task_p_add_pid(pid_t pid)
+{
+ (void)pid;
+ return SLURM_SUCCESS;
+}
+
+int task_p_signal(stepd_step_rec_t *step, int sig)
+{
+ if (step && step->pgid > 1) {
+ slurm_debug("task/pgid: sending signal %d to PGID %d", sig, step->pgid);
+ if (killpg((pid_t)step->pgid, sig) < 0) {
+ slurm_error("task/pgid: killpg(%d) failed: %s", step->pgid, strerror(errno));
+ return SLURM_ERROR;
+ }
+ }
+ return SLURM_SUCCESS;
+}
+int task_p_fini(stepd_step_rec_t *step) { (void)step; return SLURM_SUCCESS; }
+
diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_task_Makefile.in b/sysutils/slurm-wlm/files/patch-src_plugins_task_Makefile.in
new file mode 100644
--- /dev/null
+++ b/sysutils/slurm-wlm/files/patch-src_plugins_task_Makefile.in
@@ -0,0 +1,20 @@
+--- src/plugins/task/Makefile.in.orig 2024-05-21 17:19:51 UTC
++++ src/plugins/task/Makefile.in
+@@ -202,7 +202,7 @@ am__define_uniq_tagged_files = \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+-DIST_SUBDIRS = affinity cray_aries cgroup
++DIST_SUBDIRS = affinity cray_aries cgroup pgid
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+@@ -465,7 +465,7 @@ top_srcdir = @top_srcdir@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = affinity cray_aries $(am__append_1)
++SUBDIRS = affinity cray_aries pgid $(am__append_1)
+ all: all-recursive
+
+ .SUFFIXES:

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 12:35 AM (6 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32421832
Default Alt Text
D52143.id160912.diff (7 KB)

Event Timeline