Update slurm memory logging

bbimber · bbimber · commit 5f02031e7c5b · 2024-11-29T12:44:12.000-08:00
diff --git a/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java b/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java
@@ -315,7 +315,7 @@ else if (headerFound)
                                     long requestInBytes = FileSizeFormatter.convertStringRepresentationToBytes(getConfig().getRequestMemory() + "G"); //request is always GB
                                     if (bytes > requestInBytes)
                                     {
-                                        info = "Job exceeded memory, max was: " + FileSizeFormatter.convertBytesToUnit(bytes, 'G') + "G";
+                                        info = "Job exceeded memory, max was: " + FileSizeFormatter.convertBytesToUnit(bytes, 'G') + "G, requested memory was: " + getConfig().getRequestMemory() + "G";
 
                                         PipelineStatusFile sf = PipelineService.get().getStatusFile(job.getJobId());
                                         if (sf != null)

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ else if (headerFound)`
`315`	`315`	`long requestInBytes = FileSizeFormatter.convertStringRepresentationToBytes(getConfig().getRequestMemory() + "G"); //request is always GB`
`316`	`316`	`if (bytes > requestInBytes)`
`317`	`317`	`{`
`318`		`- info = "Job exceeded memory, max was: " + FileSizeFormatter.convertBytesToUnit(bytes, 'G') + "G";`
	`318`	`+ info = "Job exceeded memory, max was: " + FileSizeFormatter.convertBytesToUnit(bytes, 'G') + "G, requested memory was: " + getConfig().getRequestMemory() + "G";`
`319`	`319`
`320`	`320`	`PipelineStatusFile sf = PipelineService.get().getStatusFile(job.getJobId());`
`321`	`321`	`if (sf != null)`