HADOOP-13883. Addendum patch to correct the message and alphabetized with the earlier patch. Contributed by Yiqun Lin.
This commit is contained in:
parent
b811a1c14d
commit
6938b67711
|
@ -212,10 +212,11 @@ public class GenericOptionsParser {
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("static-access")
|
@SuppressWarnings("static-access")
|
||||||
private static synchronized Options buildGeneralOptions(Options opts) {
|
private static synchronized Options buildGeneralOptions(Options opts) {
|
||||||
Option fs = OptionBuilder.withArgName("local|namenode:port")
|
Option fs = OptionBuilder.withArgName("file:///|hdfs://namenode:port")
|
||||||
.hasArg()
|
.hasArg()
|
||||||
.withDescription("specify a namenode")
|
.withDescription("specify default filesystem URL to use, "
|
||||||
.create("fs");
|
+ "overrides 'fs.defaultFS' property from configurations.")
|
||||||
|
.create("fs");
|
||||||
Option jt = OptionBuilder.withArgName("local|resourcemanager:port")
|
Option jt = OptionBuilder.withArgName("local|resourcemanager:port")
|
||||||
.hasArg()
|
.hasArg()
|
||||||
.withDescription("specify a ResourceManager")
|
.withDescription("specify a ResourceManager")
|
||||||
|
@ -569,8 +570,9 @@ public class GenericOptionsParser {
|
||||||
+ "specify an application configuration file");
|
+ "specify an application configuration file");
|
||||||
out.println("-D <property=value> "
|
out.println("-D <property=value> "
|
||||||
+ "define a value for a given property");
|
+ "define a value for a given property");
|
||||||
out.println("-fs <local|namenode:port> "
|
out.println("-fs <file:///|hdfs://namenode:port> "
|
||||||
+ "specify a namenode");
|
+ "specify default filesystem URL to use, overrides "
|
||||||
|
+ "'fs.defaultFS' property from configurations.");
|
||||||
out.println("-jt <local|resourcemanager:port> "
|
out.println("-jt <local|resourcemanager:port> "
|
||||||
+ "specify a ResourceManager");
|
+ "specify a ResourceManager");
|
||||||
out.println("-files <file1,...> "
|
out.println("-files <file1,...> "
|
||||||
|
|
|
@ -54,11 +54,11 @@ Many subcommands honor a common set of configuration options to alter their beha
|
||||||
|
|
||||||
| GENERIC\_OPTION | Description |
|
| 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. |
|
| `-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. |
|
| `-conf <configuration file> ` | Specify an application configuration file. |
|
||||||
| `-D <property>=<value> ` | Use value for given property. |
|
| `-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. |
|
| `-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. |
|
| `-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. |
|
| `-libjars <comma seperated list of jars> ` | Specify comma separated jar files to include in the classpath. Applies only to job. |
|
||||||
|
|
||||||
|
|
|
@ -307,7 +307,9 @@ public class TestPipeApplication {
|
||||||
"-D <property=value> define a value for a given "
|
"-D <property=value> define a value for a given "
|
||||||
+ "property"));
|
+ "property"));
|
||||||
assertTrue(out.toString()
|
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(
|
assertTrue(out.toString().contains(
|
||||||
"-jt <local|resourcemanager:port> specify a ResourceManager"));
|
"-jt <local|resourcemanager:port> specify a ResourceManager"));
|
||||||
assertTrue(out.toString().contains(
|
assertTrue(out.toString().contains(
|
||||||
|
|
Loading…
Reference in New Issue