Bugfix for situation where squeue command lacks optional fields

bbimber · bbimber · commit 55379fda5b0e · 2022-06-08T10:39:44.000-07:00
diff --git a/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java b/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java
@@ -172,15 +172,15 @@ protected Set<String> updateStatusForAllJobs() throws PipelineJobException
                             }
                             else
                             {
-                                String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;
+                                String hostname = hostnameIdx != -1 && tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;
                                 if (hostname != null)
                                 {
                                     j.setHostname(hostname);
                                 }
 
                                 Pair<String, String> status = translateSlurmStatusToTaskStatus(StringUtils.trimToNull(tokens[stateIdx]));
 
-                                String reason = tokens.length > reasonIdx ? StringUtils.trimToNull(tokens[reasonIdx]) : null;
+                                String reason = reasonIdx != -1 && tokens.length > reasonIdx ? StringUtils.trimToNull(tokens[reasonIdx]) : null;
                                 if (reason != null)
                                 {
                                     if (!"Priority".equals(reason))

Original file line number	Diff line number	Diff line change
`@@ -172,15 +172,15 @@ protected Set<String> updateStatusForAllJobs() throws PipelineJobException`
`172`	`172`	`}`
`173`	`173`	`else`
`174`	`174`	`{`
`175`		`- String hostname = tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;`
	`175`	`+ String hostname = hostnameIdx != -1 && tokens.length > hostnameIdx ? StringUtils.trimToNull(tokens[hostnameIdx]) : null;`
`176`	`176`	`if (hostname != null)`
`177`	`177`	`{`
`178`	`178`	`j.setHostname(hostname);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`Pair<String, String> status = translateSlurmStatusToTaskStatus(StringUtils.trimToNull(tokens[stateIdx]));`
`182`	`182`
`183`		`- String reason = tokens.length > reasonIdx ? StringUtils.trimToNull(tokens[reasonIdx]) : null;`
	`183`	`+ String reason = reasonIdx != -1 && tokens.length > reasonIdx ? StringUtils.trimToNull(tokens[reasonIdx]) : null;`
`184`	`184`	`if (reason != null)`
`185`	`185`	`{`
`186`	`186`	`if (!"Priority".equals(reason))`