Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Removed & refactored unused module code * Allowed to set transports programmatically * Allow to set the source of the changed transport Note: The current implementation breaks BWC as you need to specify a concrete transport now instead of a module if you want to use a different Transport or HttpServerTransport Closes #7289
- Loading branch information
Showing
11 changed files
with
303 additions
and
358 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 0 additions & 34 deletions
34
src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransportModule.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 0 additions & 42 deletions
42
src/main/java/org/elasticsearch/transport/local/LocalTransportModule.java
This file was deleted.
Oops, something went wrong.
42 changes: 0 additions & 42 deletions
42
src/main/java/org/elasticsearch/transport/netty/NettyTransportModule.java
This file was deleted.
Oops, something went wrong.
100 changes: 100 additions & 0 deletions
100
src/test/java/org/elasticsearch/plugins/PluggableTransportModuleTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.plugins; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.common.inject.Inject; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.test.ElasticsearchIntegrationTest; | ||
| import org.elasticsearch.test.transport.AssertingLocalTransport; | ||
| import org.elasticsearch.threadpool.ThreadPool; | ||
| import org.elasticsearch.transport.*; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; | ||
| import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; | ||
| import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; | ||
| import static org.hamcrest.Matchers.*; | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| @ClusterScope(scope = Scope.SUITE, numDataNodes = 2) | ||
| public class PluggableTransportModuleTests extends ElasticsearchIntegrationTest { | ||
|
|
||
| public static final AtomicInteger SENT_REQUEST_COUNTER = new AtomicInteger(0); | ||
|
|
||
| @Override | ||
| protected Settings nodeSettings(int nodeOrdinal) { | ||
| return settingsBuilder() | ||
| .put("plugin.types", CountingSentRequestsPlugin.class.getName()) | ||
| .put(super.nodeSettings(nodeOrdinal)) | ||
| .build(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testThatPluginFunctionalityIsLoadedWithoutConfiguration() throws Exception { | ||
| for (Transport transport : internalCluster().getInstances(Transport.class)) { | ||
| assertThat(transport, instanceOf(CountingAssertingLocalTransport.class)); | ||
| } | ||
|
|
||
| // the cluster node communication on start up is sufficient to increase the counter | ||
| // no need to do anything specific | ||
| int count = SENT_REQUEST_COUNTER.get(); | ||
| assertThat("Expected send request counter to be greather than zero", count, is(greaterThan(0))); | ||
|
|
||
| // sending a new request via client node will increase the sent requests | ||
| internalCluster().clientNodeClient().admin().cluster().prepareHealth().get(); | ||
| assertThat("Expected send request counter to be greather than zero", SENT_REQUEST_COUNTER.get(), is(greaterThan(count))); | ||
| } | ||
|
|
||
| public static class CountingSentRequestsPlugin extends AbstractPlugin { | ||
| @Override | ||
| public String name() { | ||
| return "counting-pipelines-plugin"; | ||
| } | ||
|
|
||
| @Override | ||
| public String description() { | ||
| return "counting-pipelines-plugin"; | ||
| } | ||
|
|
||
| public void onModule(TransportModule transportModule) { | ||
| transportModule.setTransport(CountingAssertingLocalTransport.class, this.name()); | ||
| } | ||
| } | ||
|
|
||
| public static final class CountingAssertingLocalTransport extends AssertingLocalTransport { | ||
|
|
||
| @Inject | ||
| public CountingAssertingLocalTransport(Settings settings, ThreadPool threadPool, Version version) { | ||
| super(settings, threadPool, version); | ||
| } | ||
|
|
||
| @Override | ||
| public void sendRequest(final DiscoveryNode node, final long requestId, final String action, final TransportRequest request, TransportRequestOptions options) throws IOException, TransportException { | ||
| SENT_REQUEST_COUNTER.incrementAndGet(); | ||
| super.sendRequest(node, requestId, action, request, options); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.