honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a request headers bug in transport client 

Where the configured request headers were not sent with sniffing requests (both node/info & cluster state sniffing)
This commit is contained in:
uboness 2014-08-16 02:36:35 +02:00
parent f4115b84a7
commit 40c63ad07a
8 changed files with 88 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java
View File

@ -38,7 +38,7 @@ public class ClusterStateResponse extends ActionResponse {
public ClusterStateResponse() {
}
ClusterStateResponse(ClusterName clusterName, ClusterState clusterState) {
public ClusterStateResponse(ClusterName clusterName, ClusterState clusterState) {
this.clusterName = clusterName;
this.clusterState = clusterState;
}

10
src/main/java/org/elasticsearch/client/support/Headers.java
View File

@ -19,10 +19,10 @@
package org.elasticsearch.client.support;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.transport.TransportMessage;
/**
* Client request headers picked up from the client settings. Applied to every
@ -34,7 +34,8 @@ public class Headers {
public static final Headers EMPTY = new Headers(ImmutableSettings.EMPTY) {
@Override
public void applyTo(ActionRequest request) {
public <M extends TransportMessage<?>> M applyTo(M message) {
return message;
}
};
@ -45,10 +46,11 @@ public class Headers {
headers = resolveHeaders(settings);
}
public void applyTo(ActionRequest request) {
public <M extends TransportMessage<?>> M applyTo(M message) {
for (String key : headers.names()) {
request.putHeader(key, headers.get(key));
message.putHeader(key, headers.get(key));
}
return message;
}
static Settings resolveHeaders(Settings settings) {

2
src/main/java/org/elasticsearch/client/transport/TransportClient.java
View File

@ -100,7 +100,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
*/
public class TransportClient extends AbstractClient {
private final Injector injector;
final Injector injector;
private final Settings settings;

12
src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
View File

@ -33,6 +33,7 @@ import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.elasticsearch.action.admin.cluster.state.ClusterStateAction;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.client.Requests;
import org.elasticsearch.client.support.Headers;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.component.AbstractComponent;
@ -69,6 +70,8 @@ public class TransportClientNodesService extends AbstractComponent {
private final Version minCompatibilityVersion;
private final Headers headers;
// nodes that are added to be discovered
private volatile ImmutableList<DiscoveryNode> listedNodes = ImmutableList.of();
@ -90,12 +93,14 @@ public class TransportClientNodesService extends AbstractComponent {
private volatile boolean closed;
@Inject
public TransportClientNodesService(Settings settings, ClusterName clusterName, TransportService transportService, ThreadPool threadPool, Version version) {
public TransportClientNodesService(Settings settings, ClusterName clusterName, TransportService transportService,
ThreadPool threadPool, Headers headers, Version version) {
super(settings);
this.clusterName = clusterName;
this.transportService = transportService;
this.threadPool = threadPool;
this.minCompatibilityVersion = version.minimumCompatibilityVersion();
this.headers = headers;
this.nodesSamplerInterval = componentSettings.getAsTime("nodes_sampler_interval", timeValueSeconds(5));
this.pingTimeout = componentSettings.getAsTime("ping_timeout", timeValueSeconds(5)).millis();
@ -342,7 +347,7 @@ public class TransportClientNodesService extends AbstractComponent {
}
try {
NodesInfoResponse nodeInfo = transportService.submitRequest(listedNode, NodesInfoAction.NAME,
Requests.nodesInfoRequest("_local"),
headers.applyTo(Requests.nodesInfoRequest("_local")),
TransportRequestOptions.options().withType(TransportRequestOptions.Type.STATE).withTimeout(pingTimeout),
new FutureTransportResponseHandler<NodesInfoResponse>() {
@Override
@ -413,8 +418,7 @@ public class TransportClientNodesService extends AbstractComponent {
}
}
transportService.sendRequest(listedNode, ClusterStateAction.NAME,
Requests.clusterStateRequest()
.clear().nodes(true).local(true),
headers.applyTo(Requests.clusterStateRequest().clear().nodes(true).local(true)),
TransportRequestOptions.options().withType(TransportRequestOptions.Type.STATE).withTimeout(pingTimeout),
new BaseTransportResponseHandler<ClusterStateResponse>() {

25
src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java
View File

@ -132,6 +132,24 @@ public abstract class AbstractClientHeadersTests extends ElasticsearchTestCase {
client.admin().indices().prepareFlush().execute().addListener(new AssertingActionListener<FlushResponse>(FlushAction.NAME));
}
protected static void assertHeaders(Map<String, Object> headers) {
assertThat(headers, notNullValue());
assertThat(headers.size(), is(2));
assertThat(headers.get("key1"), notNullValue());
assertThat(headers.get("key1").toString(), equalTo("val1"));
assertThat(headers.get("key2"), notNullValue());
assertThat(headers.get("key2").toString(), equalTo("val 2"));
}
protected static void assertHeaders(TransportMessage<?> message) {
assertThat(message.getHeaders(), notNullValue());
assertThat(message.getHeaders().size(), is(2));
assertThat(message.getHeader("key1"), notNullValue());
assertThat(message.getHeader("key1").toString(), equalTo("val1"));
assertThat(message.getHeader("key2"), notNullValue());
assertThat(message.getHeader("key2").toString(), equalTo("val 2"));
}
protected static class InternalException extends Exception {
private final String action;
@ -165,12 +183,7 @@ public abstract class AbstractClientHeadersTests extends ElasticsearchTestCase {
assertThat("expected action [" + action + "] to throw an internal exception", e, notNullValue());
assertThat(action, equalTo(((InternalException) e).action));
Map<String, Object> headers = ((InternalException) e).headers;
assertThat(headers, notNullValue());
assertThat(headers.size(), is(2));
assertThat(headers.get("key1"), notNullValue());
assertThat(headers.get("key1").toString(), equalTo("val1"));
assertThat(headers.get("key2"), notNullValue());
assertThat(headers.get("key2").toString(), equalTo("val 2"));
assertHeaders(headers);
}
public Throwable unwrap(Throwable t, Class<? extends Throwable> exceptionType) {

2
src/test/java/org/elasticsearch/client/transport/InternalTransportClientTests.java
View File

@ -72,7 +72,7 @@ public class InternalTransportClientTests extends ElasticsearchTestCase {
};
transportService = new TransportService(ImmutableSettings.EMPTY, transport, threadPool);
transportService.start();
transportClientNodesService = new TransportClientNodesService(ImmutableSettings.EMPTY, ClusterName.DEFAULT, transportService, threadPool, Version.CURRENT);
transportClientNodesService = new TransportClientNodesService(ImmutableSettings.EMPTY, ClusterName.DEFAULT, transportService, threadPool, Headers.EMPTY, Version.CURRENT);
Map<String, GenericAction> actions = new HashMap<>();
actions.put(NodesInfoAction.NAME, NodesInfoAction.INSTANCE);
actions.put(TestAction.NAME, TestAction.INSTANCE);

50
src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java
View File

@ -19,22 +19,33 @@
package org.elasticsearch.client.transport;
import org.elasticsearch.Version;
import org.elasticsearch.action.GenericAction;
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoAction;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.elasticsearch.action.admin.cluster.state.ClusterStateAction;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.client.AbstractClientHeadersTests;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.LocalTransportAddress;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.*;
import org.junit.Test;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
/**
*
@ -55,8 +66,32 @@ public class TransportClientHeadersTests extends AbstractClientHeadersTests {
return client;
}
@Test
public void testWithSniffing() throws Exception {
TransportClient client = new TransportClient(ImmutableSettings.builder()
.put("client.transport.sniff", true)
.put("cluster.name", "cluster1")
.put("client.transport.nodes_sampler_interval", "1s")
.put(TransportModule.TRANSPORT_SERVICE_TYPE_KEY, InternalTransportService.class.getName())
.put(HEADER_SETTINGS)
.build());
client.addTransportAddress(address);
InternalTransportService service = (InternalTransportService) client.injector.getInstance(TransportService.class);
if (!service.clusterStateLatch.await(5, TimeUnit.SECONDS)) {
fail("takes way too long to get the cluster state");
}
assertThat(client.connectedNodes().size(), is(1));
assertThat(client.connectedNodes().get(0).getAddress(), is((TransportAddress) address));
}
public static class InternalTransportService extends TransportService {
CountDownLatch clusterStateLatch = new CountDownLatch(1);
@Inject
public InternalTransportService(Settings settings, Transport transport, ThreadPool threadPool) {
super(settings, transport, threadPool);
@ -65,9 +100,18 @@ public class TransportClientHeadersTests extends AbstractClientHeadersTests {
@Override @SuppressWarnings("unchecked")
public <T extends TransportResponse> void sendRequest(DiscoveryNode node, String action, TransportRequest request, TransportRequestOptions options, TransportResponseHandler<T> handler) {
if (NodesInfoAction.NAME.equals(action)) {
assertHeaders(request);
((TransportResponseHandler<NodesInfoResponse>) handler).handleResponse(new NodesInfoResponse(ClusterName.DEFAULT, new NodeInfo[0]));
return;
}
if (ClusterStateAction.NAME.equals(action)) {
assertHeaders(request);
ClusterName cluster1 = new ClusterName("cluster1");
((TransportResponseHandler<ClusterStateResponse>) handler).handleResponse(new ClusterStateResponse(cluster1, state(cluster1)));
clusterStateLatch.countDown();
return;
}
handler.handleException(new TransportException("", new InternalException(action, request)));
}
@ -83,4 +127,10 @@ public class TransportClientHeadersTests extends AbstractClientHeadersTests {
}
}
private static ClusterState state(ClusterName clusterName) {
ClusterState.Builder builder = ClusterState.builder(clusterName);
builder.nodes(DiscoveryNodes.builder().put(new DiscoveryNode("node_id", address, Version.CURRENT)));
return builder.build();
}
}

3
src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.client.transport;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.client.support.Headers;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.settings.ImmutableSettings;
@ -59,7 +60,7 @@ public class TransportClientNodesServiceTests extends ElasticsearchTestCase {
};
transportService = new TransportService(ImmutableSettings.EMPTY, transport, threadPool);
transportService.start();
transportClientNodesService = new TransportClientNodesService(ImmutableSettings.EMPTY, ClusterName.DEFAULT, transportService, threadPool, Version.CURRENT);
transportClientNodesService = new TransportClientNodesService(ImmutableSettings.EMPTY, ClusterName.DEFAULT, transportService, threadPool, Headers.EMPTY, Version.CURRENT);
nodesCount = randomIntBetween(1, 10);
for (int i = 0; i < nodesCount; i++) {