Repository: spark Updated Branches: refs/heads/branch-1.1 5dd571c29 -> f02e327f0
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 (cherry picked from commit bc95fe08dff62a0abea314ab4ab9275c8f119598) Signed-off-by: Josh Rosen <joshro...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f02e327f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f02e327f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f02e327f Branch: refs/heads/branch-1.1 Commit: f02e327f0bc975e7f33092e449bc0edd95f95580 Parents: 5dd571c Author: GuoQiang Li <wi...@qq.com> Authored: Sat Aug 16 20:05:55 2014 -0700 Committer: Josh Rosen <joshro...@apache.org> Committed: Sat Aug 16 20:06:22 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/f02e327f/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-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
