Skip to content

Apache Lucene open-source search software

Wrap Executor in TaskExecutor to never reject (#13622)

Armin Brauna1816e3f65cd
diff --git a/lucene/core/src/java/org/apache/lucene/search/TaskExecutor.java b/lucene/core/src/java/org/apache/lucene/search/TaskExecutor.java
index 8832cf478e9..9d2176fd3af 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TaskExecutor.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TaskExecutor.java
@@ -28,6 +28,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.RunnableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -53,7 +54,20 @@ public final class TaskExecutor {
* @param executor the executor to be used for running tasks concurrently
*/
public TaskExecutor(Executor executor) {
- this.executor = Objects.requireNonNull(executor, "Executor is null");
+ Objects.requireNonNull(executor, "Executor is null");
+ this.executor =
+ r -> {
+ try {
+ executor.execute(r);
+ } catch (
+ @SuppressWarnings("unused")
+ RejectedExecutionException rejectedExecutionException) {
+ // execute directly on the current thread in case of rejection to ensure a rejecting
+ // executor only reduces parallelism and does not
+ // result in failure
+ r.run();
+ }
+ };
}
/**
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java b/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java
index 1949afbd51c..26847f60a2a 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTaskExecutor.java
@@ -363,4 +363,24 @@ public class TestTaskExecutor extends LuceneTestCase {
assertEquals(0, throwable.getSuppressed().length);
assertEquals(throwingTask, executedTasks.get());
}
+
+ public void testTaskRejectionDoesNotFailExecution() throws Exception {
+ try (ThreadPoolExecutor threadPoolExecutor =
+ new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<>(1))) {
+ final int taskCount = 1000; // enough tasks to cause queuing and rejections on the executor
+ final ArrayList<Callable<Void>> callables = new ArrayList<>(taskCount);
+ final AtomicInteger executedTasks = new AtomicInteger(0);
+ for (int i = 0; i < taskCount; i++) {
+ callables.add(
+ () -> {
+ executedTasks.incrementAndGet();
+ return null;
+ });
+ }
+ final TaskExecutor taskExecutor = new TaskExecutor(threadPoolExecutor);
+ var res = taskExecutor.invokeAll(callables);
+ assertEquals(taskCount, res.size());
+ assertEquals(taskCount, executedTasks.get());
+ }
+ }
}