diff options
| author | Aaron Davidson <aaron@databricks.com> | 2014-04-24 23:22:03 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-24 23:22:03 -0700 |
| commit | 45ad7f0ca7be4a89c066b246b0fee0c0c2e7c759 (patch) | |
| tree | 06a13f8bd3575570e435a8e4d11f5cdde8875cce /core | |
| parent | e03bc379ee03fde0ee4fa578d3c39aae35c63f01 (diff) | |
| download | spark-45ad7f0ca7be4a89c066b246b0fee0c0c2e7c759.tar.gz spark-45ad7f0ca7be4a89c066b246b0fee0c0c2e7c759.tar.bz2 spark-45ad7f0ca7be4a89c066b246b0fee0c0c2e7c759.zip | |
Call correct stop().
Oopsie in #504.
Author: Aaron Davidson <aaron@databricks.com>
Closes #527 from aarondav/stop and squashes the following commits:
8d1446a [Aaron Davidson] Call correct stop().
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala index 054f66a8b7..cf6ef0029a 100644 --- a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala @@ -150,11 +150,12 @@ private[spark] class DiskBlockManager(shuffleManager: ShuffleBlockManager, rootD Runtime.getRuntime.addShutdownHook(new Thread("delete Spark local dirs") { override def run() { logDebug("Shutdown hook called") - stop() + DiskBlockManager.this.stop() } }) } + /** Cleanup local dirs and stop shuffle sender. */ private[spark] def stop() { localDirs.foreach { localDir => if (localDir.isDirectory() && localDir.exists()) { |