diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2012-12-27 15:37:33 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2012-12-27 15:37:33 -0800 |
| commit | 0bc0a60d3001dd231e13057a838d4b6550e5a2b9 (patch) | |
| tree | 4caa9a8d434d32b1e17e83921a6dd5fb54db3165 /core/src/main/scala/spark/SparkContext.scala | |
| parent | 7c33f76291eda2144fe16e48e261cb62cdadb7f6 (diff) | |
| download | spark-0bc0a60d3001dd231e13057a838d4b6550e5a2b9.tar.gz spark-0bc0a60d3001dd231e13057a838d4b6550e5a2b9.tar.bz2 spark-0bc0a60d3001dd231e13057a838d4b6550e5a2b9.zip | |
Modifications to make sure LocalScheduler terminate cleanly without errors when SparkContext is shutdown, to minimize spurious exception during master failure tests.
Diffstat (limited to 'core/src/main/scala/spark/SparkContext.scala')
| -rw-r--r-- | core/src/main/scala/spark/SparkContext.scala | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/core/src/main/scala/spark/SparkContext.scala b/core/src/main/scala/spark/SparkContext.scala index caa9a1794b..0c8b0078a3 100644 --- a/core/src/main/scala/spark/SparkContext.scala +++ b/core/src/main/scala/spark/SparkContext.scala @@ -488,17 +488,19 @@ class SparkContext( if (dagScheduler != null) { dagScheduler.stop() dagScheduler = null + taskScheduler = null + // TODO: Cache.stop()? + env.stop() + // Clean up locally linked files + clearFiles() + clearJars() + SparkEnv.set(null) + ShuffleMapTask.clearCache() + ResultTask.clearCache() + logInfo("Successfully stopped SparkContext") + } else { + logInfo("SparkContext already stopped") } - taskScheduler = null - // TODO: Cache.stop()? - env.stop() - // Clean up locally linked files - clearFiles() - clearJars() - SparkEnv.set(null) - ShuffleMapTask.clearCache() - ResultTask.clearCache() - logInfo("Successfully stopped SparkContext") } /** |