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

This commit is contained in:
Brahma Reddy Battula 2016-12-31 16:16:02 +05:30
parent b811a1c14d
commit 6938b67711
3 changed files with 12 additions and 8 deletions

View File

@ -212,9 +212,10 @@ public CommandLine getCommandLine() {
*/
@SuppressWarnings("static-access")
private static synchronized Options buildGeneralOptions(Options opts) {
Option fs = OptionBuilder.withArgName("local|namenode:port")
Option fs = OptionBuilder.withArgName("file:///|hdfs://namenode:port")
.hasArg()
.withDescription("specify a namenode")
.withDescription("specify default filesystem URL to use, "
+ "overrides 'fs.defaultFS' property from configurations.")
.create("fs");
Option jt = OptionBuilder.withArgName("local|resourcemanager:port")
.hasArg()
@ -569,8 +570,9 @@ public static void printGenericCommandUsage(PrintStream out) {
+ "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,...> "

View File

@ -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. |

View File

@ -307,7 +307,9 @@ public void testSubmitter() throws Exception {
"-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(