From f2cb9b2c6b1b0435e7c8c141914c4d9ce10f91e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20M=C3=BCller?= <thorsten.mueller@uni-wuppertal.de>
Date: Fri, 30 Apr 2021 16:47:31 +0200
Subject: [PATCH] fixed log (includes log output from tasks now)

---
 roles/slurm/defaults/main.yml          | 3 +++
 roles/slurm/files/slurmctld.Dockerfile | 9 ++++++++-
 roles/slurm/files/slurmd.Dockerfile    | 9 +++++++--
 roles/slurm/templates/slurm.conf.j2    | 3 +++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml
index f5ba310..4c812ba 100644
--- a/roles/slurm/defaults/main.yml
+++ b/roles/slurm/defaults/main.yml
@@ -1 +1,4 @@
 container_privileged: False
+slurm_log_path_ctld: /var/log/slurm/slurmctld.log
+slurm_log_path_d: /var/log/slurm/slurmd.log
+slurm_log_path_sched: /var/log/slurm/slurmsched.log
diff --git a/roles/slurm/files/slurmctld.Dockerfile b/roles/slurm/files/slurmctld.Dockerfile
index 1d5ba1b..1deb7f0 100644
--- a/roles/slurm/files/slurmctld.Dockerfile
+++ b/roles/slurm/files/slurmctld.Dockerfile
@@ -16,4 +16,11 @@ ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
 
 RUN	yum install -y slurm-slurmctld && \
 	yum clean all && rm -rf /var/cache/yum
-# ... & tail --retry --pid $! -f /var/log/condor/MasterLog & })'
+
+ENV SLURMCTLD_LOG_PATH="/var/log/slurm/slurmctld.log"
+ENV SLURMD_LOG_PATH="/var/log/slurm/slurmd.log"
+ENV SLURM_SCHED_LOG_PATH="/var/log/slurm/slurmsched.log"
+
+CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & \
+	slurmctld -D 2>/dev/null 1>/dev/null & \
+	tail --retry --pid $! -f ${SLURMCTLD_LOG_PATH} ${SLURM_SCHED_LOG_PATH} & })'
diff --git a/roles/slurm/files/slurmd.Dockerfile b/roles/slurm/files/slurmd.Dockerfile
index a92ec21..2549727 100644
--- a/roles/slurm/files/slurmd.Dockerfile
+++ b/roles/slurm/files/slurmd.Dockerfile
@@ -17,5 +17,10 @@ ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
 RUN yum install -y slurm-slurmd && \
 	yum clean all && rm -rf /var/cache/yum
 
-# CMD bash -c 'cat <({ condor_master -f & tail --retry --pid $! -f /var/log/condor/MasterLog & })'
-CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & slurmd -D & })'
+ENV SLURMCTLD_LOG_PATH="/var/log/slurm/slurmctld.log"
+ENV SLURMD_LOG_PATH="/var/log/slurm/slurmd.log"
+ENV SLURM_SCHED_LOG_PATH="/var/log/slurm/slurmsched.log"
+
+CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & \
+	slurmd -D 2>/dev/null 1>/dev/null & \
+	tail --retry --pid $! -f ${SLURMD_LOG_PATH} ${SLURM_SCHED_LOG_PATH} & })'
diff --git a/roles/slurm/templates/slurm.conf.j2 b/roles/slurm/templates/slurm.conf.j2
index 95419f6..cc7e0fe 100644
--- a/roles/slurm/templates/slurm.conf.j2
+++ b/roles/slurm/templates/slurm.conf.j2
@@ -142,9 +142,12 @@ JobAcctGatherFrequency=30
 JobAcctGatherType=jobacct_gather/none
 SlurmctldDebug=verbose
 #SlurmctldLogFile=
+SlurmctldLogFile={{slurm_log_path_ctld}}
 SlurmdDebug=verbose
 #SlurmdLogFile=
+SlurmdLogFile={{slurm_log_path_d}}
 #SlurmSchedLogFile=
+SlurmSchedLogFile={{slurm_log_path_sched}}
 #SlurmSchedLogLevel=
 #
 #