Merge pull request #698 from tmaeno/master

to create pmerge jobs even when tasks throttled

Author: tmaeno

pandajedi/jedibrokerage/AtlasAnalJobBroker.py

@@ -161,7 +161,7 @@ def doBrokerage(self, taskSpec, cloudName, inputChunk, taskParamMap):
                 totalJobStat = self.taskBufferIF.countJobsPerTarget_JEDI(taskSpec.origUserName, True)
             self.set_task_common("totalJobStat", totalJobStat)
         # check total to cap
-        if totalJobStat:
+        if totalJobStat and not inputChunk.isMerging:
             if taskSpec.workingGroup:
                 gdp_token_jobs = "CAP_RUNNING_GROUP_JOBS"
                 gdp_token_cores = "CAP_RUNNING_GROUP_CORES"

pandaserver/taskbuffer/JobSpec.py

@@ -729,15 +729,15 @@ def setScoutJobFlag(self):
     # check if scout job
     def isScoutJob(self):
         return self.check_special_handling("scoutJob")
-    
+
     # set build job flag
     def set_build_job_flag(self):
         self.set_special_handling("buildJob")
 
     # check if build job
     def is_build_job(self):
         return self.check_special_handling("buildJob")
-    
+
     # set pmerge job flag
     def set_pmerge_job_flag(self):
         self.set_special_handling("pmergeJob")
@@ -795,7 +795,7 @@ def useInputPrestaging(self):
     def to_dict_advanced(self, add_extra_info=False):
         """
         Convert the JobSpec to a dictionary, including file information and optionally extra info.
-        
+
         :param add_extra_info: If True, include extra info such as job duration and extended prodSourceLabel. Default is False.
         :return: A dictionary representation of the JobSpec
         """
@@ -819,11 +819,11 @@ def to_dict_advanced(self, add_extra_info=False):
         # Add extra info if requested
         if add_extra_info:
             # Calculate job duration if startTime and endTime are available
-            if self.startTime and self.endTime:
-                ret["jobDuration"] = (self.endTime - self.startTime).total_seconds()
+            if ret["startTime"] and ret["endTime"]:
+                ret["jobDuration"] = (ret["endTime"] - ret["startTime"]).total_seconds()
             else:
                 ret["jobDuration"] = None
-            
+
             # Add extended prodSourceLabel info
             label = self.prodSourceLabel
             if self.is_build_job():