You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/01/27 19:41:04 UTC
[46/50] [abbrv] hadoop git commit: HADOOP-11509. Change parsing
sequence in GenericOptionsParser to parse -D parameters before -files.
Contributed by Xuan Gong
HADOOP-11509. Change parsing sequence in GenericOptionsParser to parse
-D parameters before -files. Contributed by Xuan Gong
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0bf33391
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0bf33391
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0bf33391
Branch: refs/heads/YARN-2928
Commit: 0bf333911c950f22ec0f784bf465306e20b0d507
Parents: 1f2b695
Author: Xuan <xg...@apache.org>
Authored: Mon Jan 26 15:35:35 2015 -0800
Committer: Xuan <xg...@apache.org>
Committed: Mon Jan 26 15:35:35 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../hadoop/util/GenericOptionsParser.java | 20 +++++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bf33391/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2806ee2..f1aab62 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -765,6 +765,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-6221 RPC Client operations cannot be interrupted. (stevel)
+ HADOOP-11509. Change parsing sequence in GenericOptionsParser to parse -D
+ parameters before -files. (xgong)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0bf33391/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 d0e7655..0a46a7a 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
@@ -284,6 +284,17 @@ public class GenericOptionsParser {
conf.addResource(new Path(value));
}
}
+
+ if (line.hasOption('D')) {
+ String[] property = line.getOptionValues('D');
+ for(String prop : property) {
+ String[] keyval = prop.split("=", 2);
+ if (keyval.length == 2) {
+ conf.set(keyval[0], keyval[1], "from command line");
+ }
+ }
+ }
+
if (line.hasOption("libjars")) {
conf.set("tmpjars",
validateFiles(line.getOptionValue("libjars"), conf),
@@ -307,15 +318,6 @@ public class GenericOptionsParser {
validateFiles(line.getOptionValue("archives"), conf),
"from -archives command line option");
}
- if (line.hasOption('D')) {
- String[] property = line.getOptionValues('D');
- for(String prop : property) {
- String[] keyval = prop.split("=", 2);
- if (keyval.length == 2) {
- conf.set(keyval[0], keyval[1], "from command line");
- }
- }
- }
conf.setBoolean("mapreduce.client.genericoptionsparser.used", true);
// tokensFile