Call correct stop().

aarondav · pwendell · commit 45ad7f0ca7be · 2014-04-24T23:22:03.000-07:00
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().
diff --git 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()) {

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,12 @@ private[spark] class DiskBlockManager(shuffleManager: ShuffleBlockManager, rootD`
`150`	`150`	`Runtime.getRuntime.addShutdownHook(new Thread("delete Spark local dirs") {`
`151`	`151`	`override def run() {`
`152`	`152`	`logDebug("Shutdown hook called")`
`153`		`- stop()`
	`153`	`+ DiskBlockManager.this.stop()`
`154`	`154`	`}`
`155`	`155`	`})`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ /** Cleanup local dirs and stop shuffle sender. */`
`158`	`159`	`private[spark] def stop() {`
`159`	`160`	`localDirs.foreach { localDir =>`
`160`	`161`	`if (localDir.isDirectory() && localDir.exists()) {`