You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2014/10/17 04:22:14 UTC
git commit: [SPARK-3741] Add afterExecute for handleConnectExecutor
Repository: spark
Updated Branches:
refs/heads/master e7f4ea8a5 -> 56fd34af5
[SPARK-3741] Add afterExecute for handleConnectExecutor
Sorry. I found that I forgot to add `afterExecute` for `handleConnectExecutor` in #2593.
Author: zsxwing <zs...@gmail.com>
Closes #2794 from zsxwing/SPARK-3741 and squashes the following commits:
a0bc4dd [zsxwing] Add afterExecute for handleConnectExecutor
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/56fd34af
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/56fd34af
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/56fd34af
Branch: refs/heads/master
Commit: 56fd34af52a18230bf3ea7b041f2a184eddc1103
Parents: e7f4ea8
Author: zsxwing <zs...@gmail.com>
Authored: Thu Oct 16 19:22:02 2014 -0700
Committer: Josh Rosen <jo...@apache.org>
Committed: Thu Oct 16 19:22:02 2014 -0700
----------------------------------------------------------------------
.../org/apache/spark/network/nio/ConnectionManager.scala | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/56fd34af/core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala b/core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala
index 9396b6b..bda4bf5 100644
--- a/core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala
+++ b/core/src/main/scala/org/apache/spark/network/nio/ConnectionManager.scala
@@ -117,7 +117,16 @@ private[nio] class ConnectionManager(
conf.getInt("spark.core.connection.connect.threads.max", 8),
conf.getInt("spark.core.connection.connect.threads.keepalive", 60), TimeUnit.SECONDS,
new LinkedBlockingDeque[Runnable](),
- Utils.namedThreadFactory("handle-connect-executor"))
+ Utils.namedThreadFactory("handle-connect-executor")) {
+
+ override def afterExecute(r: Runnable, t: Throwable): Unit = {
+ super.afterExecute(r, t)
+ if (t != null && NonFatal(t)) {
+ logError("Error in handleConnectExecutor is not handled properly", t)
+ }
+ }
+
+ }
private val serverChannel = ServerSocketChannel.open()
// used to track the SendingConnections waiting to do SASL negotiation
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org