Skip to content

[SPARK-32172][CORE]Use createDirectory instead of mkdir #28997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sidedoorleftroad wants to merge 2 commits into from
Closed

[SPARK-32172][CORE]Use createDirectory instead of mkdir #28997

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2834c30
[SPARK-32172][CORE]Use createDirectory instead of mkdir
sidedoorleftroad Jul 5, 2020
d8ffb71
Add file exists check
sidedoorleftroad Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.storage

import java.io.{File, IOException}
import java.nio.file.Files
import java.util.UUID

import org.apache.spark.SparkConf
Expand Down Expand Up @@ -69,9 +70,7 @@ private[spark] class DiskBlockManager(conf: SparkConf, deleteFilesOnStop: Boolea
old
} else {
val newDir = new File(localDirs(dirId), "%02x".format(subDirId))
if (!newDir.exists() && !newDir.mkdir()) {
throw new IOException(s"Failed to create local dir in $newDir.")
}
Files.createDirectory(newDir.toPath)

@dongjoon-hyun dongjoon-hyun Jul 5, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code looks like a regression. Previously, if the directory exists, we don't throw IOException.
Now, this PR will throw FileAlreadyExistsException if the directory exists.

@HeartSaVioR HeartSaVioR Jul 5, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, either exists() -> Files.createDirectory or just Files.createDirectories would do the trick. The side-effect of latter is that it would also create non-existence parent directories.

@dongjoon-hyun dongjoon-hyun Jul 6, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for @HeartSaVioR 's advice.

subDirs(dirId)(subDirId) = newDir
newDir
}
Expand Down