Annotate jobs with their project and task names to show them in summaries....

Annotate jobs with their project and task names to show them in summaries. Lower max job runtime to a week.

MAC/Services/src/PipelineControl.py

@@ -78,6 +78,7 @@ from lofar.sas.resourceassignment.resourceassignmentservice.config import DEFAUL
 
 import subprocess
 import datetime
+import pipes
 import os
 import re
 from socket import getfqdn
@@ -205,6 +206,10 @@ class Parset(dict):
   def otdbId(self):
     return int(self[PARSET_PREFIX + "Observation.otdbID"])
 
+  def description(self):
+    return "%s - %s" % (self[PARSET_PREFIX + "Observation.Campaign.name"],self[PARSET_PREFIX + "Observation.Scheduler.taskName"])
+    
+
 class Slurm(object):
   def __init__(self, headnode="head01.cep4.control.lofar"):
     self.headnode = headnode
@@ -422,8 +427,11 @@ class PipelineControl(OTDBBusListener):
                      # Enforce the dependencies, instead of creating lingering jobs
                      "--kill-on-invalid-dep=yes",
 
-                     # Maximum run time for job (31 days)
-                     "--time=31-0",
+                     # Maximum run time for job (7 days)
+                     "--time=7-0",
+
+                     # Annotate the job
+                     "--comment=%s" % pipes.quote(parset.description()),
 
                      # Lower priority to drop below inspection plots
                      "--nice=1000",