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/08/17 05:06:06 UTC
git commit: In the stop method of ConnectionManager to cancel the
ackTimeoutMonitor
Repository: spark
Updated Branches:
refs/heads/master 2fc8aca08 -> bc95fe08d
In the stop method of ConnectionManager to cancel the ackTimeoutMonitor
cc JoshRosen sarutak
Author: GuoQiang Li <wi...@qq.com>
Closes #1989 from witgo/cancel_ackTimeoutMonitor and squashes the following commits:
4a700fa [GuoQiang Li] In the stop method of ConnectionManager to cancel the ackTimeoutMonitor
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bc95fe08
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bc95fe08
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bc95fe08
Branch: refs/heads/master
Commit: bc95fe08dff62a0abea314ab4ab9275c8f119598
Parents: 2fc8aca
Author: GuoQiang Li <wi...@qq.com>
Authored: Sat Aug 16 20:05:55 2014 -0700
Committer: Josh Rosen <jo...@apache.org>
Committed: Sat Aug 16 20:05:55 2014 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/network/ConnectionManager.scala | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/bc95fe08/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
index 37d69a9..e77d762 100644
--- a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
+++ b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
@@ -886,6 +886,7 @@ private[spark] class ConnectionManager(
}
def stop() {
+ ackTimeoutMonitor.cancel()
selectorThread.interrupt()
selectorThread.join()
selector.close()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org