HADOOP-13883. Addendum patch to correct the message and alphabetized with the earlier patch. Contributed by Yiqun Lin.
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 eed910c..cd1fc831 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
@@ -212,10 +212,11 @@
*/
@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")
@@ -569,8 +570,9 @@
+ "specify an application configuration file");
out.println("-D <property=value> "
+ "define a value for a 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 <file1,...> "
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 696848b..27a858a 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -54,11 +54,11 @@
| 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. |
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 c8b2f3a..88d8f95 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
@@ -307,7 +307,9 @@
"-D <property=value> define a value for a given "
+ "property"));
assertTrue(out.toString()
- .contains("-fs <local|namenode:port> specify a namenode"));
+ .contains("-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.toString().contains(
