Skip to content

Handle RejectedExecutionException for node close #49334

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
merged 2 commits into from
Nov 20, 2019
Merged

Handle RejectedExecutionException for node close #49334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8465942
Handle RejectedExecutionException for node close
jaymode Nov 19, 2019
bc591fa
typed too fast
jaymode Nov 19, 2019
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 server/src/test/java/org/elasticsearch/node/NodeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,21 @@
import org.elasticsearch.test.InternalTestCluster;
import org.elasticsearch.test.MockHttpTransport;
import org.elasticsearch.threadpool.ThreadPool;
import org.hamcrest.Matchers;

import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.containsString;

@LuceneTestCase.SuppressFileSystems(value = "ExtrasFS")
public class NodeTests extends ESTestCase {
Expand Down Expand Up @@ -179,9 +180,13 @@ public void testCloseRaceWithTaskExecution() throws Exception {
} catch (InterruptedException e) {
throw new AssertionError("interrupted while waiting", e);
}
threadpool.executor(ThreadPool.Names.SEARCH).execute(() -> {
while (shouldRun.get());
});
try {
threadpool.executor(ThreadPool.Names.SEARCH).execute(() -> {
while (shouldRun.get());
});
} catch (RejectedExecutionException e) {
assertThat(e.getMessage(), containsString("[Terminated,"));
}
});
Thread closeThread = new Thread(() -> {
running.countDown();
Expand Down Expand Up @@ -267,7 +272,7 @@ public void testCloseOnLeakedIndexReaderReference() throws Exception {

IllegalStateException e = expectThrows(IllegalStateException.class, () -> node.awaitClose(1, TimeUnit.DAYS));
searcher.close();
assertThat(e.getMessage(), Matchers.containsString("Something is leaking index readers or store references"));
assertThat(e.getMessage(), containsString("Something is leaking index readers or store references"));
}

public void testCloseOnLeakedStoreReference() throws Exception {
Expand All @@ -283,6 +288,6 @@ public void testCloseOnLeakedStoreReference() throws Exception {

IllegalStateException e = expectThrows(IllegalStateException.class, () -> node.awaitClose(1, TimeUnit.DAYS));
shard.store().decRef();
assertThat(e.getMessage(), Matchers.containsString("Something is leaking index readers or store references"));
assertThat(e.getMessage(), containsString("Something is leaking index readers or store references"));
}
}