Skip to content

[Issue 3034] Add extra checks in the mock to help with error troubleshooting on CI #3049

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
dlg99 merged 1 commit into from
Feb 15, 2022
Merged

[Issue 3034] Add extra checks in the mock to help with error troubleshooting on CI #3049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions ...rc/test/java/org/apache/bookkeeper/statelib/testing/executors/MockExecutorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
import static com.google.common.base.Preconditions.checkArgument;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doAnswer;

import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture;

import java.time.Duration;
import java.util.Iterator;
import java.util.List;
Expand Down Expand Up @@ -126,17 +128,20 @@ public MockExecutorController(ExecutorService executor) {
}

private void runTask(Runnable runnable) {
if (null == executor) {
runnable.run();
} else {
try {
try {
if (null == executor) {
runnable.run();
} else {
Assert.assertThat("calling this on the same thread will result in deadlock",
Thread.currentThread().getName(),
not(containsString(THREAD_NAME_PREFIX)));
executor.submit(runnable).get();
} catch (InterruptedException | ExecutionException e) {
log.warn("runTask failed", e);
}
} catch (AssertionError ae) {
throw ae;
} catch (Throwable t) {
log.error("Got unexpected exception while submitting a Runnable", t);
fail("Got unexpected exception while submitting a Runnable " + t.getMessage());
}
}

Expand Down