Repository: spark Updated Branches: refs/heads/branch-1.0 f09a2c0af -> 3eba9bd2f
Call correct stop(). Oopsie in #504. Author: Aaron Davidson <[email protected]> Closes #527 from aarondav/stop and squashes the following commits: 8d1446a [Aaron Davidson] Call correct stop(). (cherry picked from commit 45ad7f0ca7be4a89c066b246b0fee0c0c2e7c759) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3eba9bd2 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3eba9bd2 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3eba9bd2 Branch: refs/heads/branch-1.0 Commit: 3eba9bd2fc6e6da95b36aafbce3e620b042aee55 Parents: f09a2c0 Author: Aaron Davidson <[email protected]> Authored: Thu Apr 24 23:22:03 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Thu Apr 24 23:22:15 2014 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/storage/DiskBlockManager.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3eba9bd2/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala ---------------------------------------------------------------------- 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 054f66a..cf6ef00 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()) {
