spark git commit: [SPARK-4792] Add error message when making local dir unsuccessfully

[jo...@apache.org]

Repository: spark
Updated Branches:
  refs/heads/master 81112e4b5 -> c7628771d


[SPARK-4792] Add error message when making local dir unsuccessfully

Author: meiyoula <10...@qq.com>

Closes #3635 from XuTingjun/master and squashes the following commits:

dd1c66d [meiyoula] when old is deleted, it will throw an exception where call it
2a55bc2 [meiyoula] Update DiskBlockManager.scala
1483a4a [meiyoula] Delete multiple retries to make dir
67f7902 [meiyoula] Try some times to make dir maybe more reasonable
1c51a0c [meiyoula] Update DiskBlockManager.scala


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c7628771
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c7628771
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c7628771

Branch: refs/heads/master
Commit: c7628771da9a7d4bd4d7abfdede37ce1568dcd01
Parents: 81112e4
Author: meiyoula <10...@qq.com>
Authored: Mon Dec 15 22:30:18 2014 -0800
Committer: Josh Rosen <jo...@databricks.com>
Committed: Mon Dec 15 22:30:18 2014 -0800

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/storage/DiskBlockManager.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/c7628771/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 58fba54..bb2ae9f 100644
--- a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala
@@ -17,7 +17,7 @@
 
 package org.apache.spark.storage
 
-import java.io.File
+import java.io.{IOException, File}
 import java.text.SimpleDateFormat
 import java.util.{Date, Random, UUID}
 
@@ -71,7 +71,9 @@ private[spark] class DiskBlockManager(blockManager: BlockManager, conf: SparkCon
           old
         } else {
           val newDir = new File(localDirs(dirId), "%02x".format(subDirId))
-          newDir.mkdir()
+          if (!newDir.exists() && !newDir.mkdir()) {
+            throw new IOException(s"Failed to create local dir in $newDir.")
+          }
           subDirs(dirId)(subDirId) = newDir
           newDir
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org