OK-611 Fiksattu permittien vapauttamisbugi

Opetushallitus · Dec 3, 2024 · 2180021 · 2180021
1 parent 3850a0b
commit 2180021
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/main/java/fi/vm/sade/valinta/kooste/valintalaskenta/actor/ConcurrencyLimiter.java b/src/main/java/fi/vm/sade/valinta/kooste/valintalaskenta/actor/ConcurrencyLimiter.java
@@ -123,16 +123,30 @@ public <T> CompletableFuture<T> withConcurrencyLimit(
 
     Instant waitStart = Instant.now();
     CompletableFuture<T> future = new CompletableFuture<>();
+    int requiredPermits = Math.min(this.maxPermits, permits);
 
     this.executor.submit(
         () -> {
           // haetaan lupa suorittaa pyyntö ja tallennetaan odottamiseen mennyt aika
           this.waiting.incrementAndGet();
           try {
-            this.semaphore.acquireUninterruptibly(Math.min(this.maxPermits, permits));
+            this.semaphore.acquireUninterruptibly(requiredPermits);
           } finally {
             this.waiting.decrementAndGet();
           }
+
+          if (nimi.equals("suoritukset")) {
+            LOG.info(
+                "Haettiin "
+                    + permits
+                    + " permittiä, jäi "
+                    + this.semaphore.availablePermits()
+                    + " permittiä, ajossa "
+                    + this.getActive()
+                    + ", odottaa "
+                    + this.getWaiting());
+          }
+
           Instant invokeStart = Instant.now();
           waitDurations.put(this.nimi, Duration.between(waitStart, invokeStart));
 
@@ -156,7 +170,7 @@ public <T> CompletableFuture<T> withConcurrencyLimit(
             invokeDurations.put(this.nimi, ERROR);
             future.completeExceptionally(e);
           } finally {
-            semaphore.release(permits);
+            semaphore.release(requiredPermits);
             this.active.decrementAndGet();
           }
         });