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/6938b677 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6938b677 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6938b677 Branch: refs/heads/YARN-5085 Commit: 6938b677111a5fa6bf654717b310220f98b7cf20 Parents: b811a1c Author: Brahma Reddy Battula <[email protected]> Authored: Sat Dec 31 16:16:02 2016 +0530 Committer: Brahma Reddy Battula <[email protected]> Committed: Sat Dec 31 16:16:02 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/util/GenericOptionsParser.java | 14 ++++++++------ .../hadoop-common/src/site/markdown/CommandsManual.md | 2 +- .../hadoop/mapred/pipes/TestPipeApplication.java | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6938b677/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 eed910c..cd1fc83 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 @@ 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") @@ -569,8 +570,9 @@ public class GenericOptionsParser { + "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,...> " http://git-wip-us.apache.org/repos/asf/hadoop/blob/6938b677/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 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 @@ 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/6938b677/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 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 @@ public class TestPipeApplication { "-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( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
