Merge pull request #358 from tmaeno/master

added a util function to get resource type for a job w/o hitting the database

PandaPkgInfo.py

@@ -1 +1 @@
-release_version = "0.3.5"
+release_version = "0.3.6"

pandaserver/taskbuffer/JobUtils.py

@@ -198,3 +198,17 @@ def load_jobs_json(state):
         job_spec.load_from_json_serializable(job_state)
         jobs.append(job_spec)
     return jobs
+
+
+# get resource type for a job
+def get_resource_type_job(resource_map: list, job_spec: JobSpec) -> str:
+    """
+    Get the resource type for a job based on the job's resource type and the list of resource types.
+    :param resource_map: The list of resource types.
+    :param job_spec: The job.
+    :return: The resource type.
+    """
+    for resource_spec in resource_map:
+        if resource_spec.match_job(job_spec):
+            return resource_spec.resource_name
+    return "Undefined"

pandaserver/taskbuffer/OraDBProxy.py

@@ -22829,14 +22829,9 @@ def get_resource_type_job(self, job_spec):
                 type(job_spec.coreCount),
             )
         )
-
-        for resource_spec in resource_map:
-            if resource_spec.match_job(job_spec):
-                tmp_log.debug(f"done. resource_type is {resource_spec.resource_name}")
-                return resource_spec.resource_name
-
-        tmp_log.debug("done. resource_type is Undefined")
-        return "Undefined"
+        resource_type = JobUtils.get_resource_type_job(resource_map, job_spec)
+        tmp_log.debug(f"done. resource_type is {resource_type}")
+        return resource_type
 
     # update stat of workers
     def reportWorkerStats(self, harvesterID, siteName, paramsList):