From b33cd7c8dc99a4ded01d23025a5e6ade6c632be8 Mon Sep 17 00:00:00 2001
From: "Mark A. Grondona" <mgrondona@llnl.gov>
Date: Fri, 7 Oct 2011 13:52:43 -0700
Subject: [PATCH] slurmstepd: move tty setup into fork_all_tasks
tty setup needs to occur before child tasks block waiting from signal
to the parent, so move this code out of exec_task() into fork_all_tasks()
so that the wait-for-signal-from-parent code can also later move out
of exec_task().
---
src/slurmd/slurmstepd/mgr.c | 25 ++++++++++++++++++++++++-
src/slurmd/slurmstepd/task.c | 27 +--------------------------
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index a7da99a185d..6dab4d8f2f0 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -75,6 +75,13 @@
# include <stdlib.h>
#endif
+#ifdef HAVE_PTY_H
+# include <pty.h>
+# ifdef HAVE_UTMP_H
+# include <utmp.h>
+# endif
+#endif
+
#include "slurm/slurm_errno.h"
#include "src/common/cbuf.h"
@@ -1180,7 +1187,18 @@ static int exec_wait_signal (struct exec_wait_info *e, slurmd_job_t *job)
return (0);
}
-
+static void prepare_tty (slurmd_job_t *job, slurmd_task_info_t *task)
+{
+#ifdef HAVE_PTY_H
+ if (job->pty && (task->gtid == 0)) {
+ if (login_tty(task->stdin_fd))
+ error("login_tty: %m");
+ else
+ debug3("login_tty good");
+ }
+#endif
+ return;
+}
/* fork and exec N tasks
*/
@@ -1296,6 +1314,11 @@ _fork_all_tasks(slurmd_job_t *job)
xsignal_unblock(slurmstepd_blocked_signals);
+ /*
+ * Setup tty before any setpgid() calls
+ */
+ prepare_tty (job, job->task[i]);
+
exec_task(job, i, ei->childfd);
}
diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index 4462596b35f..56fe04cd120 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -65,14 +65,6 @@
# include <sys/checkpnt.h>
#endif
-#ifdef HAVE_PTY_H
-# include <pty.h>
-#endif
-
-#ifdef HAVE_UTMP_H
-# include <utmp.h>
-#endif
-
#include <sys/resource.h>
#include "slurm/slurm_errno.h"
@@ -345,16 +337,6 @@ exec_task(slurmd_job_t *job, int i, int waitfd)
int rc;
slurmd_task_info_t *task = job->task[i];
-#ifdef HAVE_PTY_H
- /* Execute login_tty() before setpgid() calls */
- if (job->pty && (task->gtid == 0)) {
- if (login_tty(task->stdin_fd))
- error("login_tty: %m");
- else
- debug3("login_tty good");
- }
-#endif
-
if (i == 0)
_make_tmpdir(job);
@@ -422,14 +404,7 @@ exec_task(slurmd_job_t *job, int i, int waitfd)
}
}
-#ifdef HAVE_PTY_H
- if (job->pty && (task->gtid == 0)) {
- /* Need to perform the login_tty() before all tasks
- * register and the process groups are reset, otherwise
- * login_tty() gets disabled */
- } else
-#endif
- io_dup_stdio(task);
+ io_dup_stdio(task);
/* task-specific pre-launch activities */
--
GitLab