From 540fa6ea584bba354bd2de2aac472b9db80d1d01 Mon Sep 17 00:00:00 2001
From: Tsz-wo Sze <szetszwo@apache.org>
Date: Fri, 16 Mar 2012 01:31:32 +0000
Subject: [PATCH] svn merge -c 1301303 from trunk for HADOOP-8175.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301305 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt   |  2 ++
 .../java/org/apache/hadoop/fs/shell/Mkdir.java    | 15 +++++++++++----
 .../hadoop-common/src/test/resources/testConf.xml |  6 +++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7c5ad14fec8..fa6c6763220 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -276,6 +276,8 @@ Release 0.23.2 - UNRELEASED
     HADOOP-8173. FsShell needs to handle quoted metachars.  (Daryn Sharp via
     szetszwo)
 
+    HADOOP-8175. Add -p option to mkdir in FsShell.  (Daryn Sharp via szetszwo)
+
 Release 0.23.1 - 2012-02-17 
 
   INCOMPATIBLE CHANGES
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 30ce5ed4dfd..eb0fd22562f 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
@@ -39,20 +39,26 @@ class Mkdir extends FsCommand {
   }
   
   public static final String NAME = "mkdir";
-  public static final String USAGE = "<path> ...";
+  public static final String USAGE = "[-p] <path> ...";
   public static final String DESCRIPTION =
-    "Create a directory in specified location.";
+    "Create a directory in specified location.\n" +
+    "  -p  Do not fail if the directory already exists";
 
+  private boolean createParents;
+  
   @Override
   protected void processOptions(LinkedList<String> args) {
-    CommandFormat cf = new CommandFormat(1, Integer.MAX_VALUE);
+    CommandFormat cf = new CommandFormat(1, Integer.MAX_VALUE, "p");
     cf.parse(args);
+    createParents = cf.getOpt("p");
   }
 
   @Override
   protected void processPath(PathData item) throws IOException {
     if (item.stat.isDirectory()) {
-      throw new PathExistsException(item.toString());
+      if (!createParents) {
+        throw new PathExistsException(item.toString());
+      }
     } else {
       throw new PathIsNotDirectoryException(item.toString());
     }
@@ -60,6 +66,7 @@ class Mkdir extends FsCommand {
 
   @Override
   protected void processNonexistentPath(PathData item) throws IOException {
+    // TODO: should use createParents to control intermediate dir creation 
     if (!item.fs.mkdirs(item.path)) {
       throw new PathIOException(item.toString());
     }
diff --git a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
index b1ce87e888b..ade6e1a04bb 100644
--- a/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
+++ b/hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
@@ -526,7 +526,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-mkdir &lt;path&gt; \.\.\.:( |\t)*Create a directory in specified location.( )*</expected-output>
+          <expected-output>^-mkdir \[-p\] &lt;path&gt; \.\.\.:( |\t)*Create a directory in specified location.( )*</expected-output>
+        </comparator>
+        <comparator>
+          <type>TokenComparator</type>
+          <expected-output>-p  Do not fail if the directory already exists</expected-output>
         </comparator>
       </comparators>
     </test>