Merge branch 'V2_1-branch' into devel

debian/changelog

@@ -1,3 +1,10 @@
+blahp (2.1.4-1) stable; urgency=medium
+
+  * Report AllocCPUS of Slurm jobs in status result
+  * Disable email notifications for blahp->condor jobs
+
+ -- Tim Theisen <[email protected]>  Wed, 20 Jul 2022 15:30:00 -0500
+
 blahp (2.2.0-1) stable; urgency=medium
 
   * Build without Globus

rpm/blahp.spec

@@ -112,6 +112,10 @@ fi
 %{_initrddir}/glite-ce-*
 
 %changelog
+* Thu Jul 21 2021 Tim Theisen <[email protected]> 2.1.4-1
+- Report AllocCPUS of Slurm jobs in status result
+- Disable email notifications for blahp->condor jobs
+
 * Fri Oct 22 2021 Tim Theisen <[email protected]> 2.2.0-1
 - Build without Globus
 

src/scripts/slurm_status.py

@@ -322,7 +322,7 @@ def get_finished_job_stats(jobid, cluster):
     log("Querying sacct for completed job for jobid: %s" % (jobid))
 
     # List of attributes required from sacct
-    attributes = "JobID,UserCPU,SystemCPU,MaxRSS,ExitCode"
+    attributes = "JobID,UserCPU,SystemCPU,MaxRSS,ExitCode,AllocCPUS"
     child_stdout = os.popen("%s -j %s --noconvert -P --format %s" % (sacct, jobid, attributes))
     sacct_data = child_stdout.readlines()
     ret = child_stdout.close()
@@ -358,6 +358,13 @@ def get_finished_job_stats(jobid, cluster):
                 log("Failed to parse CPU usage for job id %s: %s" % (jobid, row["SystemCPU"]))
                 raise
 
+        if row["AllocCPUS"] != "" and row["JobID"] == jobid:
+            try:
+                return_dict['CpusProvisioned'] = int(row["AllocCPUS"])
+            except:
+                log("Failed to parse CPU allocation for job id %s: %s" % (jobid, row["SystemCPU"]))
+                raise
+
         # Take the largest value of MaxRSS across all lines
         if row["MaxRSS"] != "":
             # Remove the trailing [KMGTP] and scale the value appropriately