You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/04/25 08:22:10 UTC
git commit: Call correct stop().
Repository: spark
Updated Branches:
refs/heads/master e03bc379e -> 45ad7f0ca
Call correct stop().
Oopsie in #504.
Author: Aaron Davidson <aa...@databricks.com>
Closes #527 from aarondav/stop and squashes the following commits:
8d1446a [Aaron Davidson] Call correct stop().
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/45ad7f0c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/45ad7f0c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/45ad7f0c
Branch: refs/heads/master
Commit: 45ad7f0ca7be4a89c066b246b0fee0c0c2e7c759
Parents: e03bc37
Author: Aaron Davidson <aa...@databricks.com>
Authored: Thu Apr 24 23:22:03 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Apr 24 23:22:03 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/45ad7f0c/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()) {