You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2015/07/02 04:52:39 UTC
[2/2] hadoop git commit: HADOOP-12172. FsShell mkdir -p makes an
unnecessary check for the existence of the parent. Contributed by Chris
Nauroth.
HADOOP-12172. FsShell mkdir -p makes an unnecessary check for the existence of the parent. Contributed by Chris Nauroth.
(cherry picked from commit f3796224bfdfd88e2428cc8a9915bdfdc62b48f3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0d94a293
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0d94a293
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0d94a293
Branch: refs/heads/branch-2
Commit: 0d94a293a8baa4f4eaeb7015b6e23de2286a20e2
Parents: 490bef0
Author: cnauroth <cn...@apache.org>
Authored: Wed Jul 1 19:47:58 2015 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Wed Jul 1 19:48:17 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/fs/shell/Mkdir.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d94a293/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9d7398a..6bf3600 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -201,6 +201,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12112. Make hadoop-common-project Native code -Wall-clean
(alanburlison via cmccabe)
+ HADOOP-12172. FsShell mkdir -p makes an unnecessary check for the existence
+ of the parent. (cnauroth)
+
BUG FIXES
HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d94a293/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java
index 74bad62..9f39da2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Mkdir.java
@@ -70,7 +70,8 @@ class Mkdir extends FsCommand {
protected void processNonexistentPath(PathData item) throws IOException {
// check if parent exists. this is complicated because getParent(a/b/c/) returns a/b/c, but
// we want a/b
- if (!item.fs.exists(new Path(item.path.toString()).getParent()) && !createParents) {
+ if (!createParents &&
+ !item.fs.exists(new Path(item.path.toString()).getParent())) {
throw new PathNotFoundException(item.toString());
}
if (!item.fs.mkdirs(item.path)) {