Skip to content

Replacing CompletableFuture.supplyAsync() with fixed thread pool executor. CompletableFuture.supplyAsync() uses the common ForkJoinPool, which may not have enough threads. #7908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raboof merged 3 commits into from
Aug 15, 2025
Merged

Replacing CompletableFuture.supplyAsync() with fixed thread pool executor. CompletableFuture.supplyAsync() uses the common ForkJoinPool, which may not have enough threads. #7908

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac8aa3
Those tests have a race condition: it assumes all tasks start before …
Jul 23, 2025
150cd9a
Replacing CompletableFuture.supplyAsync() with fixed thread pool exec…
Jul 23, 2025
ed50dbd
Replacing CompletableFuture.supplyAsync() with fixed thread pool exec…
Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 40 additions & 34 deletions ...n/src/test/java/org/apache/geode/cache/wan/internal/WanCopyRegionFunctionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;

Expand Down Expand Up @@ -115,64 +117,66 @@ public void cancelNotRunningExecutionReturnsError() {

@Test
public void cancelAllExecutionsWithRunningExecutionsReturnsCanceledExecutions() {
CountDownLatch latch = new CountDownLatch(2);
int executions = 2;
CountDownLatch latch = new CountDownLatch(executions);
ExecutorService executorService = Executors.newFixedThreadPool(executions);
Callable<CliFunctionResult> firstExecution = () -> {
latch.await(GeodeAwaitility.getTimeout().getSeconds(), TimeUnit.SECONDS);
return null;
};

CompletableFuture
.supplyAsync(() -> {
try {
return service.execute(firstExecution, "myRegion", "mySender1");
} catch (Exception e) {
return null;
}
});
executorService.submit(() -> {
try {
return service.execute(firstExecution, "myRegion", "mySender1");
} catch (Exception e) {
return null;
}
});

Callable<CliFunctionResult> secondExecution = () -> {
latch.await(GeodeAwaitility.getTimeout().getSeconds(), TimeUnit.SECONDS);
return null;
};

CompletableFuture
.supplyAsync(() -> {
try {
return service.execute(secondExecution, "myRegion", "mySender");
} catch (Exception e) {
return null;
}
});
executorService.submit(() -> {
try {
return service.execute(secondExecution, "myRegion", "mySender");
} catch (Exception e) {
return null;
}
});

// Wait for the functions to start execution
await().untilAsserted(() -> assertThat(service.getNumberOfCurrentExecutions()).isEqualTo(2));
await().untilAsserted(
() -> assertThat(service.getNumberOfCurrentExecutions()).isEqualTo(executions));

// Cancel the function execution
String executionsString = service.cancelAll();

assertThat(executionsString).isEqualTo("[(myRegion,mySender1), (myRegion,mySender)]");
await().untilAsserted(() -> assertThat(service.getNumberOfCurrentExecutions()).isEqualTo(0));
executorService.shutdown();
}

@Test
public void severalExecuteWithDifferentRegionOrSenderAreAllowed() {
int executions = 5;
CountDownLatch latch = new CountDownLatch(executions);
ExecutorService executorService = Executors.newFixedThreadPool(executions);
for (int i = 0; i < executions; i++) {
Callable<CliFunctionResult> execution = () -> {
latch.await(GeodeAwaitility.getTimeout().getSeconds(), TimeUnit.SECONDS);
return null;
};

final String regionName = String.valueOf(i);
CompletableFuture
.supplyAsync(() -> {
try {
return service.execute(execution, regionName, "mySender1");
} catch (Exception e) {
return null;
}
});
executorService.submit(() -> {
try {
return service.execute(execution, regionName, "mySender1");
} catch (Exception e) {
return null;
}
});
}

// Wait for the functions to start execution
Expand All @@ -183,6 +187,7 @@ public void severalExecuteWithDifferentRegionOrSenderAreAllowed() {
for (int i = 0; i < executions; i++) {
latch.countDown();
}
executorService.shutdown();
}

@Test
Expand All @@ -193,6 +198,7 @@ public void concurrentExecutionsDoesNotExceedMaxConcurrentExecutions() {
int executions = 4;
CountDownLatch latch = new CountDownLatch(executions);
AtomicInteger concurrentExecutions = new AtomicInteger(0);
ExecutorService executorService = Executors.newFixedThreadPool(executions);
for (int i = 0; i < executions; i++) {
Callable<CliFunctionResult> execution = () -> {
concurrentExecutions.incrementAndGet();
Expand All @@ -202,14 +208,13 @@ public void concurrentExecutionsDoesNotExceedMaxConcurrentExecutions() {
};

final String regionName = String.valueOf(i);
CompletableFuture
.supplyAsync(() -> {
try {
return service.execute(execution, regionName, "mySender1");
} catch (Exception e) {
return null;
}
});
executorService.submit(() -> {
try {
return service.execute(execution, regionName, "mySender1");
} catch (Exception e) {
return null;
}
});
}

// Wait for the functions to start execution
Expand All @@ -225,6 +230,7 @@ public void concurrentExecutionsDoesNotExceedMaxConcurrentExecutions() {
}

await().untilAsserted(() -> assertThat(concurrentExecutions.get()).isEqualTo(0));
executorService.shutdown();
}

}
Loading