From 04b376ef2e6d195ce7c6748012d82f5367be6d84 Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Fri, 28 Mar 2003 21:38:48 +0000
Subject: [PATCH] o split log_init() in slurmd_job_log_init() into a
log_alter() and log_set_argv0() to avoid reinitializing the log mutex.
This avoids spurious debug messages on job stderr when default stderr
logging is high (a rare but annoying bug)
---
src/slurmd/mgr.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/slurmd/mgr.c b/src/slurmd/mgr.c
index 80bb2039bb2..ca9b0243a0b 100644
--- a/src/slurmd/mgr.c
+++ b/src/slurmd/mgr.c
@@ -1053,21 +1053,22 @@ _slurmd_job_log_init(slurmd_job_t *job)
*/
conf->log_opts.stderr_level = LOG_LEVEL_ERROR + job->debug;
+ snprintf(argv0, sizeof(argv0), "slurmd[%s]", conf->hostname);
+
+ /*
+ * reinitialize log
+ */
+ log_alter(conf->log_opts, 0, NULL);
+ log_set_argv0(argv0);
+
/* Connect slurmd stderr to job's stderr */
if (dup2(job->task[0]->perr[1], STDERR_FILENO) < 0) {
error("job_log_init: dup2(stderr): %m");
return;
}
+}
- fd_set_nonblocking(STDERR_FILENO);
-
- snprintf(argv0, sizeof(argv0), "slurmd[%s]", conf->hostname);
- /*
- * reinitialize log
- */
- log_init(argv0, conf->log_opts, 0, NULL);
-}
/*
--
GitLab