From 45ad7f0ca7be4a89c066b246b0fee0c0c2e7c759 Mon Sep 17 00:00:00 2001
From: Aaron Davidson <aaron@databricks.com>
Date: Thu, 24 Apr 2014 23:22:03 -0700
Subject: [PATCH] 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().
---
.../main/scala/org/apache/spark/storage/DiskBlockManager.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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()) {
--
GitLab