Minor cleanup to automatic slurm resource assignment

bbimber · bbimber · commit b9ba3a35ede4 · 2022-06-14T13:12:07.000-07:00
diff --git a/cluster/src/org/labkey/cluster/ClusterServiceImpl.java b/cluster/src/org/labkey/cluster/ClusterServiceImpl.java
@@ -37,6 +37,7 @@ public ClusterServiceImpl()
 
     }
 
+    @Override
     public void registerResourceAllocator(ClusterResourceAllocator.Factory allocator)
     {
         _allocatorList.add(allocator);
diff --git a/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java b/cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java
@@ -451,7 +451,7 @@ private File createSubmitScript(PipelineJob job) throws PipelineJobException
                         for (ClusterResourceAllocator.Factory allocatorFact : allocatorFactories)
                         {
                             ClusterResourceAllocator allocator = allocatorFact.getAllocator();
-                            job.getLogger().debug("using resource allocator: " + allocator.getClass().getName());
+                            job.getLogger().debug("using resource allocator: " + allocator.getClass().getName() + " for activeTask: " + job.getActiveTaskId());
                             Integer c = allocator.getMaxRequestCpus(job);
                             if (c != null)
                             {

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public ClusterServiceImpl()`
`37`	`37`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ @Override`
`40`	`41`	`public void registerResourceAllocator(ClusterResourceAllocator.Factory allocator)`
`41`	`42`	`{`
`42`	`43`	`_allocatorList.add(allocator);`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ private File createSubmitScript(PipelineJob job) throws PipelineJobException`
`451`	`451`	`for (ClusterResourceAllocator.Factory allocatorFact : allocatorFactories)`
`452`	`452`	`{`
`453`	`453`	`ClusterResourceAllocator allocator = allocatorFact.getAllocator();`
`454`		`- job.getLogger().debug("using resource allocator: " + allocator.getClass().getName());`
	`454`	`+ job.getLogger().debug("using resource allocator: " + allocator.getClass().getName() + " for activeTask: " + job.getActiveTaskId());`
`455`	`455`	`Integer c = allocator.getMaxRequestCpus(job);`
`456`	`456`	`if (c != null)`
`457`	`457`	`{`