fixed request leak

cowpaths · Oct 30, 2024 · 51a3708 · 51a3708
1 parent 68a4e64
commit 51a3708
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/solr/core/src/java/org/apache/solr/servlet/PriorityBasedRateLimiter.java b/solr/core/src/java/org/apache/solr/servlet/PriorityBasedRateLimiter.java
@@ -65,8 +65,13 @@ private boolean acquire(RequestPriorities priority) throws InterruptedException
         CountDownLatch wait = new CountDownLatch(1);
         this.waitingList.put(wait);
         long startTime = System.nanoTime();
-        return wait.await(this.waitTimeoutInNanos, TimeUnit.NANOSECONDS)
-            && nextInQueue(this.waitTimeoutInNanos - (System.nanoTime() - startTime));
+        if (wait.await(this.waitTimeoutInNanos, TimeUnit.NANOSECONDS)) {
+          return nextInQueue(this.waitTimeoutInNanos - (System.nanoTime() - startTime));
+        } else {
+          // remove from the queue; this/other requests already waited long enough; thus best effort
+          this.waitingList.poll();
+          return false;
+        }
       }
     }
     return true;