Bugfix for slurm parsing with PENDING jobs

bbimber · bbimber · commit 3ca0620d6456 · 2020-09-14T19:03:21.000-07:00
diff --git a/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java b/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java
@@ -158,7 +158,7 @@ protected Set<String> updateStatusForAllJobs() throws PipelineJobException
                             }
                             else
                             {
-                                String hostname = StringUtils.trimToNull(tokens[hostnameIdx]);
+                                String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;
                                 if (hostname != null)
                                 {
                                     j.setHostname(hostname);
@@ -256,7 +256,7 @@ else if (headerFound)
 
                         if (hostnameIdx > -1)
                         {
-                            String hostname = StringUtils.trimToNull(tokens[hostnameIdx]);
+                            String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;
                             if (hostname != null)
                             {
                                 if (job.getHostname() == null || !job.getHostname().equals(hostname))
@@ -632,7 +632,7 @@ private Pair<String, String> getStatusFromQueue(ClusterJob job)
                         {
                             if (hostnameIdx > -1)
                             {
-                                String hostname = StringUtils.trimToNull(tokens[hostnameIdx]);
+                                String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;
                                 if (hostname != null)
                                 {
                                     job.setHostname(hostname);

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected Set<String> updateStatusForAllJobs() throws PipelineJobException`
`158`	`158`	`}`
`159`	`159`	`else`
`160`	`160`	`{`
`161`		`- String hostname = StringUtils.trimToNull(tokens[hostnameIdx]);`
	`161`	`+ String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;`
`162`	`162`	`if (hostname != null)`
`163`	`163`	`{`
`164`	`164`	`j.setHostname(hostname);`
`@@ -256,7 +256,7 @@ else if (headerFound)`
`256`	`256`
`257`	`257`	`if (hostnameIdx > -1)`
`258`	`258`	`{`
`259`		`- String hostname = StringUtils.trimToNull(tokens[hostnameIdx]);`
	`259`	`+ String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;`
`260`	`260`	`if (hostname != null)`
`261`	`261`	`{`
`262`	`262`	`if (job.getHostname() == null \|\| !job.getHostname().equals(hostname))`
`@@ -632,7 +632,7 @@ private Pair<String, String> getStatusFromQueue(ClusterJob job)`
`632`	`632`	`{`
`633`	`633`	`if (hostnameIdx > -1)`
`634`	`634`	`{`
`635`		`- String hostname = StringUtils.trimToNull(tokens[hostnameIdx]);`
	`635`	`+ String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;`
`636`	`636`	`if (hostname != null)`
`637`	`637`	`{`
`638`	`638`	`job.setHostname(hostname);`