diff options
| author | GuoQiang Li <witgo@qq.com> | 2014-08-16 20:05:55 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@apache.org> | 2014-08-16 20:05:55 -0700 |
| commit | bc95fe08dff62a0abea314ab4ab9275c8f119598 (patch) | |
| tree | 30cfb6ea2171711cb233319db5e141f8e3c7ab76 /core | |
| parent | 2fc8aca086a2679b854038b7e2c488f19039ecbd (diff) | |
| download | spark-bc95fe08dff62a0abea314ab4ab9275c8f119598.tar.gz spark-bc95fe08dff62a0abea314ab4ab9275c8f119598.tar.bz2 spark-bc95fe08dff62a0abea314ab4ab9275c8f119598.zip | |
In the stop method of ConnectionManager to cancel the ackTimeoutMonitor
cc JoshRosen sarutak
Author: GuoQiang Li <witgo@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
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/network/ConnectionManager.scala | 1 |
1 files changed, 1 insertions, 0 deletions
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 37d69a9ec4..e77d762bdf 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() |