diff options
| author | Nithin Asokan <Nithin.Asokan@Cerner.com> | 2015-09-12 09:50:49 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-09-12 09:50:49 +0100 |
| commit | 8285e3b0d3dc0eff669eba993742dfe0401116f9 (patch) | |
| tree | 07a435c45d671fea1d5019bf8733160ccdc61845 | |
| parent | 6d8367807cb62c2cb139cee1d039dc8b12c63385 (diff) | |
| download | spark-8285e3b0d3dc0eff669eba993742dfe0401116f9.tar.gz spark-8285e3b0d3dc0eff669eba993742dfe0401116f9.tar.bz2 spark-8285e3b0d3dc0eff669eba993742dfe0401116f9.zip | |
[SPARK-10554] [CORE] Fix NPE with ShutdownHook
https://issues.apache.org/jira/browse/SPARK-10554
Fixes NPE when ShutdownHook tries to cleanup temporary folders
Author: Nithin Asokan <Nithin.Asokan@Cerner.com>
Closes #8720 from nasokan/SPARK-10554.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala | 4 |
1 files changed, 3 insertions, 1 deletions
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 3f8d26e1d4..f7e84a2c2e 100644 --- a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala @@ -164,7 +164,9 @@ private[spark] class DiskBlockManager(blockManager: BlockManager, conf: SparkCon private def doStop(): Unit = { // Only perform cleanup if an external service is not serving our shuffle files. - if (!blockManager.externalShuffleServiceEnabled || blockManager.blockManagerId.isDriver) { + // Also blockManagerId could be null if block manager is not initialized properly. + if (!blockManager.externalShuffleServiceEnabled || + (blockManager.blockManagerId != null && blockManager.blockManagerId.isDriver)) { localDirs.foreach { localDir => if (localDir.isDirectory() && localDir.exists()) { try { |