Skip to content

Remove implementations of TransportChannel #27388

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 1 commit into from
Nov 15, 2017
Merged

Remove implementations of TransportChannel #27388

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
37 changes: 1 addition & 36 deletions core/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.elasticsearch.tasks.TaskManager;

import java.io.IOException;
import java.util.function.Supplier;

public class RequestHandlerRegistry<Request extends TransportRequest> {

Expand Down Expand Up @@ -64,7 +63,7 @@ public void processMessageReceived(Request request, TransportChannel channel) th
} else {
boolean success = false;
try {
handler.messageReceived(request, new TransportChannelWrapper(taskManager, task, channel), task);
handler.messageReceived(request, new TaskTransportChannel(taskManager, task, channel), task);
success = true;
} finally {
if (success == false) {
Expand All @@ -91,38 +90,4 @@ public String toString() {
return handler.toString();
}

private static class TransportChannelWrapper extends DelegatingTransportChannel {

private final Task task;

private final TaskManager taskManager;

TransportChannelWrapper(TaskManager taskManager, Task task, TransportChannel channel) {
super(channel);
this.task = task;
this.taskManager = taskManager;
}

@Override
public void sendResponse(TransportResponse response) throws IOException {
endTask();
super.sendResponse(response);
}

@Override
public void sendResponse(TransportResponse response, TransportResponseOptions options) throws IOException {
endTask();
super.sendResponse(response, options);
}

@Override
public void sendResponse(Exception exception) throws IOException {
endTask();
super.sendResponse(exception);
}

private void endTask() {
taskManager.unregister(task);
}
}
}
38 changes: 19 additions & 19 deletions ...transport/DelegatingTransportChannel.java → ...earch/transport/TaskTransportChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,62 +20,62 @@
package org.elasticsearch.transport;

import org.elasticsearch.Version;
import org.elasticsearch.tasks.Task;
import org.elasticsearch.tasks.TaskManager;

import java.io.IOException;

/**
* Wrapper around transport channel that delegates all requests to the
* underlying channel
*/
public class DelegatingTransportChannel implements TransportChannel {
public class TaskTransportChannel implements TransportChannel {

private final Task task;

private final TaskManager taskManager;
private final TransportChannel channel;

protected DelegatingTransportChannel(TransportChannel channel) {
TaskTransportChannel(TaskManager taskManager, Task task, TransportChannel channel) {
this.channel = channel;
}

@Override
public String action() {
return channel.action();
this.task = task;
this.taskManager = taskManager;
}

@Override
public String getProfileName() {
return channel.getProfileName();
}

@Override
public long getRequestId() {
return channel.getRequestId();
}

@Override
public String getChannelType() {
return channel.getChannelType();
}

@Override
public void sendResponse(TransportResponse response) throws IOException {
endTask();
channel.sendResponse(response);
}

@Override
public void sendResponse(TransportResponse response, TransportResponseOptions options) throws IOException {
endTask();
channel.sendResponse(response, options);
}

@Override
public void sendResponse(Exception exception) throws IOException {
endTask();
channel.sendResponse(exception);
}

@Override
public Version getVersion() {
return channel.getVersion();
}

public TransportChannel getChannel() {
return channel;
}

@Override
public Version getVersion() {
return channel.getVersion();
private void endTask() {
taskManager.unregister(task);
}
}
30 changes: 11 additions & 19 deletions core/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,19 @@
import java.util.concurrent.atomic.AtomicBoolean;

public final class TcpTransportChannel<Channel> implements TransportChannel {

private final TcpTransport<Channel> transport;
protected final Version version;
protected final String action;
protected final long requestId;
private final Version version;
private final String action;
private final long requestId;
private final String profileName;
private final long reservedBytes;
private final AtomicBoolean released = new AtomicBoolean();
private final String channelType;
private final Channel channel;

public TcpTransportChannel(TcpTransport<Channel> transport, Channel channel, String channelType, String action,
long requestId, Version version, String profileName, long reservedBytes) {
TcpTransportChannel(TcpTransport<Channel> transport, Channel channel, String channelType, String action,
long requestId, Version version, String profileName, long reservedBytes) {
this.version = version;
this.channel = channel;
this.transport = transport;
Expand All @@ -51,11 +52,6 @@ public String getProfileName() {
return profileName;
}

@Override
public String action() {
return this.action;
}

@Override
public void sendResponse(TransportResponse response) throws IOException {
sendResponse(response, TransportResponseOptions.EMPTY);
Expand All @@ -78,6 +74,7 @@ public void sendResponse(Exception exception) throws IOException {
release(true);
}
}

private Exception releaseBy;

private void release(boolean isExceptionResponse) {
Expand All @@ -91,23 +88,18 @@ private void release(boolean isExceptionResponse) {
}
}

@Override
public long getRequestId() {
return requestId;
}

@Override
public String getChannelType() {
return channelType;
}

public Channel getChannel() {
return channel;
}

@Override
public Version getVersion() {
return version;
}

public Channel getChannel() {
return channel;
}
}

4 changes: 0 additions & 4 deletions core/src/main/java/org/elasticsearch/transport/TransportChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@
*/
public interface TransportChannel {

String action();

String getProfileName();

long getRequestId();

String getChannelType();

void sendResponse(TransportResponse response) throws IOException;
Expand Down
22 changes: 3 additions & 19 deletions core/src/main/java/org/elasticsearch/transport/TransportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,8 +1117,8 @@ static class DirectResponseChannel implements TransportChannel {
final TransportService service;
final ThreadPool threadPool;

DirectResponseChannel(Logger logger, DiscoveryNode localNode, String action, long requestId,
TransportService service, ThreadPool threadPool) {
DirectResponseChannel(Logger logger, DiscoveryNode localNode, String action, long requestId, TransportService service,
ThreadPool threadPool) {
this.logger = logger;
this.localNode = localNode;
this.action = action;
Expand All @@ -1127,11 +1127,6 @@ static class DirectResponseChannel implements TransportChannel {
this.threadPool = threadPool;
}

@Override
public String action() {
return action;
}

@Override
public String getProfileName() {
return DIRECT_RESPONSE_PROFILE;
Expand Down Expand Up @@ -1177,13 +1172,7 @@ public void sendResponse(Exception exception) throws IOException {
if (ThreadPool.Names.SAME.equals(executor)) {
processException(handler, rtx);
} else {
threadPool.executor(handler.executor()).execute(new Runnable() {
@SuppressWarnings({"unchecked"})
@Override
public void run() {
processException(handler, rtx);
}
});
threadPool.executor(handler.executor()).execute(() -> processException(handler, rtx));
}
}
}
Expand All @@ -1205,11 +1194,6 @@ protected void processException(final TransportResponseHandler handler, final Re
}
}

@Override
public long getRequestId() {
return requestId;
}

@Override
public String getChannelType() {
return "direct";
Expand Down
10 changes: 0 additions & 10 deletions .../org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,11 +471,6 @@ public TransportResponse getCapturedResponse() {
return capturedResponse;
}

@Override
public String action() {
return null;
}

@Override
public String getProfileName() {
return "";
Expand All @@ -494,11 +489,6 @@ public void sendResponse(TransportResponse response, TransportResponseOptions op
public void sendResponse(Exception exception) throws IOException {
}

@Override
public long getRequestId() {
return 0;
}

@Override
public String getChannelType() {
return "test";
Expand Down
10 changes: 0 additions & 10 deletions ...st/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,11 +1237,6 @@ public void execute() throws Exception {
public TransportChannel createTransportChannel(final PlainActionFuture<TestResponse> listener) {
return new TransportChannel() {

@Override
public String action() {
return null;
}

@Override
public String getProfileName() {
return "";
Expand All @@ -1262,11 +1257,6 @@ public void sendResponse(Exception exception) throws IOException {
listener.onFailure(exception);
}

@Override
public long getRequestId() {
return 0;
}

@Override
public String getChannelType() {
return "replica_test";
Expand Down
10 changes: 0 additions & 10 deletions core/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,11 +914,6 @@ public void clear() {
error.set(null);
}

@Override
public String action() {
return "_noop_";
}

@Override
public String getProfileName() {
return "_noop_";
Expand All @@ -942,11 +937,6 @@ public void sendResponse(Exception exception) throws IOException {
assertThat(response.get(), nullValue());
}

@Override
public long getRequestId() {
return 0;
}

@Override
public String getChannelType() {
return "capturing";
Expand Down
10 changes: 0 additions & 10 deletions core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import org.elasticsearch.discovery.Discovery;
import org.elasticsearch.discovery.zen.PublishClusterStateActionTests.AssertingAckListener;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.plugins.ClusterPlugin;
import org.elasticsearch.test.ClusterServiceUtils;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.VersionUtils;
Expand Down Expand Up @@ -378,21 +377,12 @@ public void testValidateOnUnsupportedIndexVersionCreated() throws Exception {
} else {
AtomicBoolean sendResponse = new AtomicBoolean(false);
request.messageReceived(new MembershipAction.ValidateJoinRequest(stateBuilder.build()), new TransportChannel() {
@Override
public String action() {
return null;
}

@Override
public String getProfileName() {
return null;
}

@Override
public long getRequestId() {
return 0;
}

@Override
public String getChannelType() {
return null;
Expand Down