fixed log (includes log output from tasks now)

This commit is contained in:
2021-04-30 16:47:31 +02:00
parent 38a5b89de9
commit f2cb9b2c6b
4 changed files with 21 additions and 3 deletions

View File

@@ -1 +1,4 @@
container_privileged: False 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

View File

@@ -16,4 +16,11 @@ ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
RUN yum install -y slurm-slurmctld && \ RUN yum install -y slurm-slurmctld && \
yum clean all && rm -rf /var/cache/yum 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} & })'

View File

@@ -17,5 +17,10 @@ ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
RUN yum install -y slurm-slurmd && \ RUN yum install -y slurm-slurmd && \
yum clean all && rm -rf /var/cache/yum yum clean all && rm -rf /var/cache/yum
# CMD bash -c 'cat <({ condor_master -f & tail --retry --pid $! -f /var/log/condor/MasterLog & })' ENV SLURMCTLD_LOG_PATH="/var/log/slurm/slurmctld.log"
CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & slurmd -D & })' 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} & })'

View File

@@ -142,9 +142,12 @@ JobAcctGatherFrequency=30
JobAcctGatherType=jobacct_gather/none JobAcctGatherType=jobacct_gather/none
SlurmctldDebug=verbose SlurmctldDebug=verbose
#SlurmctldLogFile= #SlurmctldLogFile=
SlurmctldLogFile={{slurm_log_path_ctld}}
SlurmdDebug=verbose SlurmdDebug=verbose
#SlurmdLogFile= #SlurmdLogFile=
SlurmdLogFile={{slurm_log_path_d}}
#SlurmSchedLogFile= #SlurmSchedLogFile=
SlurmSchedLogFile={{slurm_log_path_sched}}
#SlurmSchedLogLevel= #SlurmSchedLogLevel=
# #
# #