Skip to content

Disabling Utils.chmod700 for Windows #4299

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
MartinWeindel wants to merge 5 commits into from
Closed

Disabling Utils.chmod700 for Windows #4299

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac4749c
fixed chmod700 for Windows
Jan 30, 2015
fe2740b
moved comment
Feb 1, 2015
4de5e91
reverted to unix line ends
MartinWeindel Feb 2, 2015
f17072e
moved condition to caller to avoid confusion on chmod700() return value
MartinWeindel Feb 2, 2015
535cb7f
fixed last commit
MartinWeindel Feb 2, 2015
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
4 changes: 3 additions & 1 deletion core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,9 @@ private[spark] object Utils extends Logging {
if (dir.exists() || !dir.mkdirs()) {
dir = null
} else {
if (!chmod700(dir)) {
// Restrict file permissions via chmod if available.
// For Windows this step is ignored.
if (!isWindows && !chmod700(dir)) {
Copy link
Contributor

@JoshRosen JoshRosen Feb 2, 2015

Choose a reason for hiding this comment

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

What if we swapped the order of these conditionals so that we first attempt to change the permissions and then ignore failures if we're running on Windows? Would that work, or would it fail with an exception?

Copy link
Contributor

@JoshRosen JoshRosen Feb 2, 2015

Choose a reason for hiding this comment

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

Actually, the current ordering seems more intuitive, so I'm going to keep the patch in its current form.

dir.delete()
dir = null
}
Expand Down