diff options
| author | zsxwing <zsxwing@gmail.com> | 2015-10-03 01:04:35 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-10-03 01:04:35 -0700 |
| commit | 107320c9bbfe2496963a4e75e60fd6ba7fbfbabc (patch) | |
| tree | 869ad3f1a13445c563493492075feb77d4c45606 /network | |
| parent | 314bc68435ac3901a97724b9eccd1daf8f89578e (diff) | |
| download | spark-107320c9bbfe2496963a4e75e60fd6ba7fbfbabc.tar.gz spark-107320c9bbfe2496963a4e75e60fd6ba7fbfbabc.tar.bz2 spark-107320c9bbfe2496963a4e75e60fd6ba7fbfbabc.zip | |
[SPARK-6028] [CORE] Remerge #6457: new RPC implemetation and also pick #8905
This PR just reverted https://github.com/apache/spark/commit/02144d6745ec0a6d8877d969feb82139bd22437f to remerge #6457 and also included the commits in #8905.
Author: zsxwing <zsxwing@gmail.com>
Closes #8944 from zsxwing/SPARK-6028.
Diffstat (limited to 'network')
3 files changed, 7 insertions, 0 deletions
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 df841288a0..fbb8bb6b2f 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,6 +78,10 @@ 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 2ba92a40f8..dbb7f95f55 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,4 +52,6 @@ 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 df60278058..96941d26be 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,6 +71,7 @@ public class TransportRequestHandler extends MessageHandler<RequestMessage> { @Override public void exceptionCaught(Throwable cause) { + rpcHandler.exceptionCaught(cause, reverseClient); } @Override |