diff --git a/MAC/Services/src/PipelineControl.py b/MAC/Services/src/PipelineControl.py index e8d97a0341a11b47e6054e83a737719060df4a81..9b2b134a0490867bf2b33254df91ac43af48d507 100755 --- a/MAC/Services/src/PipelineControl.py +++ b/MAC/Services/src/PipelineControl.py @@ -497,13 +497,12 @@ runcmd docker-run-slurm.sh --rm --net=host \ -v /data:/data \ {image} \ runPipeline.sh -o {obsid} -c /opt/lofar/share/pipeline/pipeline.cfg.{cluster} -P {parset_dir} - RESULT=$? -if [ $RESULT -eq 0 ]; then - # notify that we're tearing down - runcmd {setStatus_completing} +# notify that we're tearing down +runcmd {setStatus_completing} +if [ $RESULT -eq 0 ]; then # wait for MoM to pick up feedback before we set finished status runcmd sleep 60 @@ -512,17 +511,8 @@ if [ $RESULT -eq 0 ]; then # notify ganglia wget -O - -q "http://ganglia.control.lofar/ganglia/api/events.php?action=add&start_time=now&summary=Pipeline {obsid} FINISHED&host_regex=" -else - # notify system that we've aborted - runcmd {setStatus_aborted} - - # notify ganglia - wget -O - -q "http://ganglia.control.lofar/ganglia/api/events.php?action=add&start_time=now&summary=Pipeline {obsid} ABORTED&host_regex=" fi -# remove the abort-trigger job -scancel --jobname={obsid}-abort-trigger - # report status back to SLURM echo "Pipeline exited with status $RESULT" exit $RESULT @@ -537,7 +527,6 @@ exit $RESULT setStatus_active = setStatus_cmdline("active"), setStatus_completing = setStatus_cmdline("completing"), setStatus_finished = setStatus_cmdline("finished"), - setStatus_aborted = setStatus_cmdline("aborted"), ), sbatch_params=sbatch_params