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 ji...@apache.org on 2016/12/07 21:10:51 UTC
[51/76] [abbrv] hadoop git commit: YARN-5828. Native services client
errors out when config formats are uppercase. Contributed by Billie Rinaldi
YARN-5828. Native services client errors out when config formats are uppercase. Contributed by Billie Rinaldi
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2d644dfb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2d644dfb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2d644dfb
Branch: refs/heads/yarn-native-services
Commit: 2d644dfbddb601c4576634cbe6e92c7ae1cfc3f6
Parents: fc6901a
Author: Gour Saha <go...@apache.org>
Authored: Thu Nov 3 18:15:44 2016 -0700
Committer: Jian He <ji...@apache.org>
Committed: Wed Dec 7 13:00:06 2016 -0800
----------------------------------------------------------------------
.../org/apache/slider/core/registry/docstore/ConfigFormat.java | 4 +++-
.../src/main/java/org/apache/slider/providers/ProviderUtils.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d644dfb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/docstore/ConfigFormat.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/docstore/ConfigFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/docstore/ConfigFormat.java
index ddab606..723b975 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/docstore/ConfigFormat.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/core/registry/docstore/ConfigFormat.java
@@ -18,6 +18,8 @@
package org.apache.slider.core.registry.docstore;
+import java.util.Locale;
+
public enum ConfigFormat {
JSON("json"),
@@ -51,7 +53,7 @@ public enum ConfigFormat {
*/
public static ConfigFormat resolve(String type) {
for (ConfigFormat format: values()) {
- if (format.getSuffix().equals(type)) {
+ if (format.getSuffix().equals(type.toLowerCase(Locale.ENGLISH))) {
return format;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d644dfb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
index c5e6782..39986c1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-slider/hadoop-yarn-slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
@@ -611,7 +611,7 @@ public class ProviderUtils implements RoleKeys, SliderKeys {
}
ConfigFormat configFormat = ConfigFormat.resolve(configFileType);
if (configFormat == null) {
- throw new BadConfigException("Config format " + configFormat +
+ throw new BadConfigException("Config format " + configFileType +
" doesn't exist");
}
localizeConfigFile(launcher, roleName, roleGroup, configEntry.getKey(),
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org