hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bra...@apache.org
Subject hadoop git commit: HADOOP-13883. Addendum patch to correct the message and alphabetized with the earlier patch. Contributed by Yiqun Lin.
Date Sat, 31 Dec 2016 10:57:52 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 0ff9efcf3 -> b8be8f0d4


HADOOP-13883. Addendum patch to correct the message and alphabetized  with the earlier patch.
Contributed by Yiqun Lin.


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

Branch: refs/heads/branch-2.8
Commit: b8be8f0d4f06c4ee29187cd81c2982ec8d4c408e
Parents: 0ff9efc
Author: Brahma Reddy Battula <brahma@apache.org>
Authored: Sat Dec 31 16:27:17 2016 +0530
Committer: Brahma Reddy Battula <brahma@apache.org>
Committed: Sat Dec 31 16:27:17 2016 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/util/GenericOptionsParser.java   | 13 ++++++++-----
 .../hadoop-common/src/site/markdown/CommandsManual.md  |  2 +-
 .../hadoop/mapred/pipes/TestPipeApplication.java       |  4 +++-
 3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8be8f0d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
index cdc7b59..0fc3bed 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
@@ -209,10 +209,11 @@ public class GenericOptionsParser {
    */
   @SuppressWarnings("static-access")
   private static synchronized Options buildGeneralOptions(Options opts) {
-    Option fs = OptionBuilder.withArgName("local|namenode:port")
-    .hasArg()
-    .withDescription("specify a namenode")
-    .create("fs");
+    Option fs = OptionBuilder.withArgName("file:///|hdfs://namenode:port")
+        .hasArg()
+        .withDescription("specify default filesystem URL to use, "
+        + "overrides 'fs.defaultFS' property from configurations.")
+        .create("fs");
     Option jt = OptionBuilder.withArgName("local|resourcemanager:port")
     .hasArg()
     .withDescription("specify a ResourceManager")
@@ -503,7 +504,9 @@ public class GenericOptionsParser {
     out.println("Generic options supported are");
     out.println("-conf <configuration file>     specify an application configuration
file");
     out.println("-D <property=value>            use value for given property");
-    out.println("-fs <local|namenode:port>      specify a namenode");
+    out.println("-fs <file:///|hdfs://namenode:port> "
+        + "specify default filesystem URL to use, overrides "
+        + "'fs.defaultFS' property from configurations.");
     out.println("-jt <local|resourcemanager:port>    specify a ResourceManager");
     out.println("-files <comma separated list of files>    " + 
       "specify comma separated files to be copied to the map reduce cluster");

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8be8f0d/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
index fc5b9fe..86f1837 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -39,11 +39,11 @@ Many subcommands honor a common set of configuration options to alter
their beha
 
 | GENERIC\_OPTION | Description |
 |:---- |:---- |
-| `-fs <local> or <namenode:port>` | Specify a NameNode. |
 | `-archives <comma separated list of archives> ` | Specify comma separated archives
to be unarchived on the compute machines. Applies only to job. |
 | `-conf <configuration file> ` | Specify an application configuration file. |
 | `-D <property>=<value> ` | Use value for given property. |
 | `-files <comma separated list of files> ` | Specify comma separated files to be copied
to the map reduce cluster. Applies only to job. |
+| `-fs <file:///> or <hdfs://namenode:port>` | Specify default filesystem URL
to use. Overrides 'fs.defaultFS' property from configurations. |
 | `-jt <local> or <resourcemanager:port>` | Specify a ResourceManager. Applies
only to job. |
 | `-libjars <comma seperated list of jars> ` | Specify comma separated jar files to
include in the classpath. Applies only to job. |
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8be8f0d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
index 64fdf41..28f4186 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
@@ -306,7 +306,9 @@ public class TestPipeApplication {
       assertTrue(out.toString().contains(
               "-D <property=value>            use value for given property"));
       assertTrue(out.toString().contains(
-              "-fs <local|namenode:port>      specify a namenode"));
+          "-fs <file:///|hdfs://namenode:port> "
+          + "specify default filesystem URL to use, overrides "
+          + "'fs.defaultFS' property from configurations."));
       assertTrue(out.toString().contains(
               "-jt <local|resourcemanager:port>    specify a ResourceManager"));
       assertTrue(out


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


Mime
View raw message