From 02144d6745ec0a6d8877d969feb82139bd22437f Mon Sep 17 00:00:00 2001 From: Xiangrui Meng Date: Thu, 24 Sep 2015 08:25:44 -0700 Subject: Revert "[SPARK-6028][Core]A new RPC implemetation based on the network module" This reverts commit 084e4e126211d74a79e8dbd2d0e604dd3c650822. --- .../main/java/org/apache/spark/network/client/TransportClient.java | 4 ---- .../src/main/java/org/apache/spark/network/server/RpcHandler.java | 2 -- .../java/org/apache/spark/network/server/TransportRequestHandler.java | 1 - 3 files changed, 7 deletions(-) (limited to 'network') diff --git a/network/common/src/main/java/org/apache/spark/network/client/TransportClient.java b/network/common/src/main/java/org/apache/spark/network/client/TransportClient.java index fbb8bb6b2f..df841288a0 100644 --- a/network/common/src/main/java/org/apache/spark/network/client/TransportClient.java +++ b/network/common/src/main/java/org/apache/spark/network/client/TransportClient.java @@ -78,10 +78,6 @@ public class TransportClient implements Closeable { this.handler = Preconditions.checkNotNull(handler); } - public Channel getChannel() { - return channel; - } - public boolean isActive() { return channel.isOpen() || channel.isActive(); } diff --git a/network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java b/network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java index dbb7f95f55..2ba92a40f8 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java +++ b/network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java @@ -52,6 +52,4 @@ public abstract class RpcHandler { * No further requests will come from this client. */ public void connectionTerminated(TransportClient client) { } - - public void exceptionCaught(Throwable cause, TransportClient client) { } } diff --git a/network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java b/network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java index 96941d26be..df60278058 100644 --- a/network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java +++ b/network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java @@ -71,7 +71,6 @@ public class TransportRequestHandler extends MessageHandler { @Override public void exceptionCaught(Throwable cause) { - rpcHandler.exceptionCaught(cause, reverseClient); } @Override -- cgit v1.2.3