SLIDER-948 recover from Hadoop's cutting of HdfsConfiguration from hdfs-client (now corrected). Keeping all copy-pasted keys in-house anyway, for safety
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6c8afeda Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6c8afeda Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6c8afeda Branch: refs/heads/feature/SLIDER-82-anti-affinity-attempt-2 Commit: 6c8afeda7f5a159f662318e42d175e6191d23995 Parents: 9d7a20b Author: Steve Loughran <ste...@apache.org> Authored: Wed Oct 28 17:13:43 2015 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Oct 28 17:13:43 2015 +0000 ---------------------------------------------------------------------- slider-core/pom.xml | 2 ++ .../src/main/java/org/apache/slider/common/SliderXmlConfKeys.java | 2 -- .../apache/slider/providers/slideram/SliderAMProviderService.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c8afeda/slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/slider-core/pom.xml b/slider-core/pom.xml index 86684f6..42b5f28 100644 --- a/slider-core/pom.xml +++ b/slider-core/pom.xml @@ -258,11 +258,13 @@ <scope>compile</scope> </dependency> +<!-- if the move to hadoop-hdfs-client JAR causes problems insert this <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>compile</scope> </dependency> +--> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c8afeda/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java index 34423a9..07214b2 100644 --- a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java +++ b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java @@ -174,7 +174,6 @@ public interface SliderXmlConfKeys { String KEY_AM_LAUNCH_ENV = "slider.am.launch.env"; - /** * From {@code DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY} */ @@ -182,7 +181,6 @@ public interface SliderXmlConfKeys { String DFS_DATANODE_KERBEROS_PRINCIPAL_KEY = "dfs.datanode.kerberos.principal"; - //Delegation token related keys String DFS_NAMENODE_DELEGATION_KEY_UPDATE_INTERVAL_KEY = "dfs.namenode.delegation.key.update-interval"; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c8afeda/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java index 9617745..cee7a97 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java @@ -20,6 +20,7 @@ package org.apache.slider.providers.slideram; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.registry.client.binding.RegistryTypeUtils; @@ -136,7 +137,7 @@ public class SliderAMProviderService extends AbstractProviderService implements new PublishedConfiguration( "HDFS site settings", ConfigHelper.loadFromResource("hdfs-site.xml"), - defaultYarnConfig) ); + new HdfsConfiguration(true)) ); try {