Create an order to check consumable resources

Since consumable resources might track information, it makes sense to check
some before others. This provides a way to do that.

changes/add_cr_order.md

@@ -0,0 +1 @@
+* Allows setting checking order on conumable resources

vidarr-pluginapi/src/main/java/ca/on/oicr/gsi/vidarr/ConsumableResource.java

@@ -75,6 +75,19 @@ default Optional<HttpHandler> httpHandler() {
    */
   Optional<Pair<String, BasicType>> inputFromSubmitter();
 
+  /**
+   * The order in which this resource should be checked.
+   *
+   * <p>Some consumable resources might want to be checked first, especially ones that intend to
+   * track information. This causes Vidarr to check consumable resources in an order that makes
+   * sense for those resources.
+   *
+   * @return the priority; larger is earlier
+   */
+  default int priority() {
+    return 0;
+  }
+
   /**
    * Indicate that Vidarr has restarted and it is reasserting an old claim.
    *

vidarr-server/src/main/java/ca/on/oicr/gsi/vidarr/server/ConsumableResourceChecker.java

@@ -10,12 +10,12 @@
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Comparator;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DSL;
 
@@ -70,7 +70,11 @@ public void run() {
       return;
     }
     var i = 0;
-    final var resourceBrokers = target.consumableResources().collect(Collectors.toList());
+    final var resourceBrokers =
+        target
+            .consumableResources()
+            .sorted(Comparator.comparing(cr -> cr.second().priority()))
+            .toList();
     for (i = 0; i < resourceBrokers.size(); i++) {
       final var name = resourceBrokers.get(i).first();
       final var broker = resourceBrokers.get(i).second();
@@ -101,11 +105,16 @@ public Optional<String> unavailable() {
       if (error.isPresent()) {
         updateBlockedResource(error.get());
         // Each resource performs a check and only releases resources if they've been acquired
-        for (int ix=0; ix < resourceBrokers.size(); ix++){
-          final var tempbroker = resourceBrokers.get(ix).second();
-          tempbroker.release(workflow, workflowVersion, vidarrId, tempbroker.inputFromSubmitter().map(def -> consumableResources.get(def.first())));
+        for (final var b : resourceBrokers.subList(0, i)) {
+          b.second()
+              .release(
+                  workflow,
+                  workflowVersion,
+                  vidarrId,
+                  b.second().inputFromSubmitter().map(def -> consumableResources.get(def.first())));
         }
-        //Must balance hammering vidarr with requests and adding significant delay to workflow runtime
+        // Must balance hammering vidarr with requests and adding significant delay to workflow
+        // runtime
         executor.schedule(this, 5, TimeUnit.MINUTES);
         return;
       }