Skip to content
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

Jump to bottom

Changed BulkheadImpl.releasePermit to ensure that it claims a permit when running a task from the pending queue #366

Merged
merged 2 commits into from
Jun 24, 2023
Merged

Changed BulkheadImpl.releasePermit to ensure that it claims a permit when running a task from the pending queue #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc074c8
Changed BulkheadImpl.releasePermit to ensure that it claims a permit …
Jun 24, 2023
282e07e
Shorten sleepTime in testPermitAcquiredAfterWaitWithLargeQueue to mak…
Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/src/main/java/dev/failsafe/internal/BulkheadImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,10 @@ public synchronized void releasePermit() {
if (permits < maxPermits) {
permits += 1;
CompletableFuture<Void> future = futures.pollFirst();
if (future != null)
if (future != null){
permits -= 1;
future.complete(null);
}
}
}

Expand Down
26 changes: 26 additions & 0 deletions core/src/test/java/dev/failsafe/functional/BulkheadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
import dev.failsafe.Bulkhead;
import dev.failsafe.BulkheadFullException;
import dev.failsafe.Failsafe;
import dev.failsafe.FailsafeExecutor;
import dev.failsafe.function.CheckedRunnable;
import dev.failsafe.testing.Testing;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;

/**
* Tests various Bulkhead scenarios.
Expand All @@ -46,6 +51,27 @@ public void testPermitAcquiredAfterWait() {
}, "test");
}

public void testPermitAcquiredAfterWaitWithLargeQueue(){
Bulkhead<Object> bulkhead = Bulkhead.builder(1).withMaxWaitTime(Duration.ofSeconds(15)).build();
FailsafeExecutor<Object> exec = Failsafe.with(bulkhead);
CompletableFuture<Void>[] tasks = new CompletableFuture[10];
for(int i = 0; i < tasks.length; i++){
int index = i;
CheckedRunnable sleep = () -> {
ignoreExceptions(() ->{
System.out.println("Running sleep task " + (index + 1));
TimeUnit.MILLISECONDS.sleep(10);
System.out.println("Finished sleep task " + (index + 1));
});
};
CompletableFuture<Void> task = exec.runAsync(sleep);
task.whenComplete((r, ex) -> Assert.assertNull(ex));
tasks[i] = task;
}

CompletableFuture.allOf(tasks).join();
}

public void shouldThrowBulkheadFullExceptionAfterPermitsExceeded() {
// Given
Bulkhead<Object> bulkhead = Bulkhead.of(2);
Expand Down