Fix memory usage parsing for SLURM and PBS (SOFTWARE-2929)

Author: brianhlin

src/scripts/pbs_status.py

@@ -336,8 +336,20 @@ def get_finished_job_stats(jobid):
             if row["AveCPU"] is not "":
                 return_dict['RemoteUserCpu'] += convert_cpu_to_seconds(row["AveCPU"]) * int(row["AllocCPUS"])
             if row["MaxRSS"] is not "":
-                # Remove the trailing 'K'
-                return_dict["ImageSize"] += int(row["MaxRSS"].replace('K', ''))
+                # Remove the trailing [KMGTP] and scale the value appropriately
+                # Note: We assume that all values will have a suffix, and we
+                #   want the value in kilos.
+                value = row["MaxRSS"]
+                factor = 1
+                if value[-1] == 'M':
+                    factor = 1024
+                elif value[-1] == 'G':
+                    factor = 1024 * 1024
+                elif value[-1] == 'T':
+                    factor = 1024 * 1024 * 1024
+                elif value[-1] == 'P':
+                    factor = 1024 * 1024 * 1024 * 1024
+                return_dict["ImageSize"] += int(value.strip('KMGTP')) * factor
             if row["ExitCode"] is not "":
                 return_dict["ExitCode"] = int(row["ExitCode"].split(":")[0])
 

src/scripts/slurm_status.py

@@ -325,8 +325,20 @@ def get_finished_job_stats(jobid):
         if row["AveCPU"] is not "":
             return_dict['RemoteUserCpu'] += convert_cpu_to_seconds(row["AveCPU"]) * int(row["AllocCPUS"])
         if row["MaxRSS"] is not "":
-            # Remove the trailing 'K'
-            return_dict["ImageSize"] += int(row["MaxRSS"].replace('K', ''))
+            # Remove the trailing [KMGTP] and scale the value appropriately
+            # Note: We assume that all values will have a suffix, and we
+            #   want the value in kilos.
+            value = row["MaxRSS"]
+            factor = 1
+            if value[-1] == 'M':
+                factor = 1024
+            elif value[-1] == 'G':
+                factor = 1024 * 1024
+            elif value[-1] == 'T':
+                factor = 1024 * 1024 * 1024
+            elif value[-1] == 'P':
+                factor = 1024 * 1024 * 1024 * 1024
+            return_dict["ImageSize"] += int(value.strip('KMGTP')) * factor
         if row["ExitCode"] is not "":
             return_dict["ExitCode"] = int(row["ExitCode"].split(":")[0])