Commit f347dae6 authored by Maiken's avatar Maiken
Browse files

Missed one if test in the merge conflict handling

parent ecd0e98f
Pipeline #9766 passed with stages
in 158 minutes and 6 seconds
......@@ -329,29 +329,32 @@ function handle_diag_file {
fi
done
date_to_utc_seconds "$starttime"
starttime_seconds="$return_date_seconds"
seconds_to_mds_date "$return_date_seconds"
LRMSStartTime=$return_mds_date
date_to_utc_seconds "$endtime"
endtime_seconds="$return_date_seconds"
seconds_to_mds_date "$return_date_seconds"
LRMSEndTime=$return_mds_date
# if "sacct -j $localid.batch" return string "NCPUS|NNodes..." only, the job has no batch stage, it was killed before start on WN
if [ ! z"$cpus" = "zNCPUS" ] ; then
date_to_utc_seconds "$starttime"
starttime_seconds="$return_date_seconds"
seconds_to_mds_date "$return_date_seconds"
LRMSStartTime=$return_mds_date
date_to_utc_seconds "$endtime"
endtime_seconds="$return_date_seconds"
seconds_to_mds_date "$return_date_seconds"
LRMSEndTime=$return_mds_date
#TODO handle exitcode etc.
walltime=$(( $endtime_seconds - $starttime_seconds))
slurm_interval_to_seconds "$usercputime"
cputime="$return_interval_seconds"
slurm_interval_to_seconds "$kernelcputime"
kernel="$return_interval_seconds"
#TODO handle exitcode etc.
walltime=$(( $endtime_seconds - $starttime_seconds))
slurm_interval_to_seconds "$usercputime"
cputime="$return_interval_seconds"
slurm_interval_to_seconds "$kernelcputime"
kernel="$return_interval_seconds"
# Values to write to diag. These will override values already written.
[ -n "$walltime" ] && WallTime=$walltime
[ -n "$cpus" ] && Processors=$cpus
[ -n "$cputime" ] && UserTime=$cputime
[ -n "$kernel" ] && KernelTime=$kernel
job_write_diag
# Values to write to diag. These will override values already written.
[ -n "$walltime" ] && WallTime=$walltime
[ -n "$cpus" ] && Processors=$cpus
[ -n "$cputime" ] && UserTime=$cputime
[ -n "$kernel" ] && KernelTime=$kernel
job_write_diag
fi
}
if [ ! -z "$perflogdir" ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment