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

Do not set up NodeAndClusterIdStateListener in test #38110

Merged
merged 1 commit into from
Jan 31, 2019
Merged

Do not set up NodeAndClusterIdStateListener in test #38110

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions server/src/main/java/org/elasticsearch/node/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,7 @@ public Node start() throws NodeValidationException {
transportService.acceptIncomingRequests();
discovery.startInitialJoin();
final TimeValue initialStateTimeout = DiscoverySettings.INITIAL_STATE_TIMEOUT_SETTING.get(settings);
NodeAndClusterIdStateListener.getAndSetNodeIdAndClusterId(clusterService,
injector.getInstance(ThreadPool.class).getThreadContext());
configureNodeAndClusterIdStateListener(clusterService);

if (initialStateTimeout.millis() > 0) {
final ThreadPool thread = injector.getInstance(ThreadPool.class);
Expand Down Expand Up @@ -737,6 +736,11 @@ public void onTimeout(TimeValue timeout) {
return this;
}

protected void configureNodeAndClusterIdStateListener(ClusterService clusterService) {
NodeAndClusterIdStateListener.getAndSetNodeIdAndClusterId(clusterService,
injector.getInstance(ThreadPool.class).getThreadContext());
}

private Node stop() {
if (!lifecycle.moveToStopped()) {
return this;
Expand Down
5 changes: 5 additions & 0 deletions test/framework/src/main/java/org/elasticsearch/node/MockNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,9 @@ protected HttpServerTransport newHttpTransport(NetworkModule networkModule) {
return new MockHttpTransport();
}
}

@Override
protected void configureNodeAndClusterIdStateListener(ClusterService clusterService) {
//do not configure this in tests as this is causing SetOnce to throw exceptions when jvm is used for multiple tests
}
}