Skip to content

Commit ea5e51b

Browse files
committed
Improved logging on slurm execution errors
1 parent 3532743 commit ea5e51b

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

cluster/src/org/labkey/cluster/pipeline/AbstractClusterExecutionEngine.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,11 @@ protected List<String> execute(String command)
725725
String output = IOUtils.toString(p.getInputStream(), StringUtilsLabKey.DEFAULT_CHARSET);
726726
String errorOutput = IOUtils.toString(p.getErrorStream(), StringUtilsLabKey.DEFAULT_CHARSET);
727727

728-
p.waitFor();
728+
int exitCode = p.waitFor();
729+
if (exitCode != 0)
730+
{
731+
_log.error("Non-zero exit from command: " + command);
732+
}
729733

730734
if (errorOutput != null)
731735
{

cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ protected List<String> submitJobToCluster(ClusterJob j, PipelineJob job) throws
8888
}
8989
}
9090
}
91+
else
92+
{
93+
_log.info("No output returned after slurm command: " + command);
94+
}
9195

9296
if (j.getClusterId() == null)
9397
{

singlecell/resources/web/singlecell/panel/SingleCellProcessingPanel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Ext4.define('SingleCell.panel.SingleCellProcessingPanel', {
7878
useOutputFileContainer.setValue(val !== 'individual');
7979
}
8080
},
81-
value: null,
81+
value: this.outputFileIds.size === 1 ? 'individual' : null,
8282
allowBlank: false
8383
},{
8484
xtype: 'checkbox',

0 commit comments

Comments
 (0)