SLIDER-948, handle changes in HDFS keys and class visibility in 3.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fb38ea7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fb38ea7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fb38ea7c Branch: refs/heads/feature/SLIDER-82-anti-affinity-attempt-2 Commit: fb38ea7c191ab40f2a34edd2640dedd1e115936a Parents: 94b2610 Author: Steve Loughran <[email protected]> Authored: Wed Oct 14 17:27:47 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Tue Oct 27 13:38:09 2015 +0000 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 10 ++---- .../apache/slider/common/SliderXmlConfKeys.java | 36 ++++++++++++++++++-- .../apache/slider/common/tools/SliderUtils.java | 4 +-- .../slider/core/build/InstanceBuilder.java | 6 ++-- .../slideram/SliderAMProviderService.java | 3 +- .../server/appmaster/SliderAppMaster.java | 7 ++-- .../security/FsDelegationTokenManager.java | 13 +++---- .../slider/client/TestCommonArgParsing.groovy | 5 ++- .../model/mock/MockContainerStatus.groovy | 3 ++ .../TestFsDelegationTokenManager.groovy | 7 ++-- .../slider/test/YarnMiniClusterTestBase.groovy | 3 +- .../funtest/framework/CommandTestBase.groovy | 2 -- 12 files changed, 59 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 16e5c9a..7698b64 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -34,8 +34,6 @@ import org.apache.hadoop.fs.PathNotFoundException; import org.apache.hadoop.fs.RemoteIterator; import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.permission.FsPermission; -import org.apache.hadoop.hdfs.DFSConfigKeys; -import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.registry.client.api.RegistryConstants; import org.apache.hadoop.registry.client.api.RegistryOperations; @@ -293,7 +291,6 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe */ public SliderClient() { super("Slider Client"); - new HdfsConfiguration(); new YarnConfiguration(); } @@ -2242,7 +2239,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe */ addConfOptionToCLI(commandLine, config, - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); + DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); } // write out the path output commandLine.addOutAndErrFiles(STDOUT_AM, STDERR_AM); @@ -2406,11 +2403,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe */ private void propagatePrincipals(Configuration config, AggregateConf clusterSpec) { - String dfsPrincipal = config.get( - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); + String dfsPrincipal = config.get(DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); if (dfsPrincipal != null) { String siteDfsPrincipal = OptionKeys.SITE_XML_PREFIX + - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY; + DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY; clusterSpec.getAppConfOperations().getGlobalOptions().putIfUnset( siteDfsPrincipal, dfsPrincipal); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/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 3d2b868..34423a9 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 @@ -166,11 +166,41 @@ public interface SliderXmlConfKeys { */ String KEY_IPC_CLIENT_RETRY_POLICY_ENABLED = "slider.ipc.client.retry.enabled"; - public static final boolean IPC_CLIENT_RETRY_POLICY_ENABLED_DEFAULT = true; - public static final String KEY_IPC_CLIENT_RETRY_POLICY_SPEC = + boolean IPC_CLIENT_RETRY_POLICY_ENABLED_DEFAULT = true; + String KEY_IPC_CLIENT_RETRY_POLICY_SPEC = "slider.ipc.client.retry.policy.spec"; - public static final String IPC_CLIENT_RETRY_POLICY_SPEC_DEFAULT = + String IPC_CLIENT_RETRY_POLICY_SPEC_DEFAULT = "10000,6,60000,10"; //t1,n1,t2,n2,... String KEY_AM_LAUNCH_ENV = "slider.am.launch.env"; + + + /** + * From {@code DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY} + */ + String DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY = "dfs.namenode.kerberos.principal"; + + 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"; + long DFS_NAMENODE_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT = 24 * 60 * 60 * + 1000; // 1 day + String DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_KEY + = "dfs.namenode.delegation.token.renew-interval"; + long DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT = 24 * 60 * 60 * + 1000; // 1 day + String DFS_NAMENODE_DELEGATION_TOKEN_MAX_LIFETIME_KEY + = "dfs.namenode.delegation.token.max-lifetime"; + long DFS_NAMENODE_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT = 7 * 24 * 60 * 60 * + 1000; // 7 days + String DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_KEY + = "dfs.namenode.delegation.token.always-use"; // for tests + boolean DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_DEFAULT = false; + String DFS_NAMENODE_KEYTAB_FILE_KEY = "dfs.namenode.keytab.file"; + String DFS_NAMENODE_DU_RESERVED_KEY = "dfs.namenode.resource.du.reserved"; + + } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java index cc19052..ee873fc 100644 --- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java +++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java @@ -35,7 +35,6 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.GlobFilter; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; -import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.nativeio.NativeIO; import org.apache.hadoop.net.NetUtils; @@ -1288,8 +1287,7 @@ public final class SliderUtils { } SliderUtils.verifyPrincipalSet(conf, YarnConfiguration.RM_PRINCIPAL); - SliderUtils.verifyPrincipalSet(conf, - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); + SliderUtils.verifyPrincipalSet(conf, SliderXmlConfKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); return true; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java b/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java index 0a8dcdb..7756055 100644 --- a/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java +++ b/slider-core/src/main/java/org/apache/slider/core/build/InstanceBuilder.java @@ -23,7 +23,6 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; -import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.slider.api.InternalKeys; import org.apache.slider.api.OptionKeys; import org.apache.slider.api.StatusKeys; @@ -203,11 +202,10 @@ public class InstanceBuilder { * Propagate any critical principals from the current site config down to the HBase one. */ public void propagatePrincipals() { - String dfsPrincipal = conf.get( - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); + String dfsPrincipal = conf.get(SliderXmlConfKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); if (dfsPrincipal != null) { String siteDfsPrincipal = OptionKeys.SITE_XML_PREFIX + - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY; + SliderXmlConfKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY; instanceDescription.getAppConfOperations().set(siteDfsPrincipal, dfsPrincipal); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/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 cee7a97..9617745 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,7 +20,6 @@ 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; @@ -137,7 +136,7 @@ public class SliderAMProviderService extends AbstractProviderService implements new PublishedConfiguration( "HDFS site settings", ConfigHelper.loadFromResource("hdfs-site.xml"), - new HdfsConfiguration(true)) ); + defaultYarnConfig) ); try { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 019ec71..7bfd59f 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -29,8 +29,6 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.permission.FsPermission; -import org.apache.hadoop.hdfs.DFSConfigKeys; -import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier; import org.apache.hadoop.http.HttpConfig; import org.apache.hadoop.io.DataOutputBuffer; @@ -84,6 +82,7 @@ import org.apache.slider.api.StatusKeys; import org.apache.slider.api.proto.SliderClusterAPI; import org.apache.slider.common.SliderExitCodes; import org.apache.slider.common.SliderKeys; +import org.apache.slider.common.SliderXmlConfKeys; import org.apache.slider.common.params.AbstractActionArgs; import org.apache.slider.common.params.SliderAMArgs; import org.apache.slider.common.params.SliderAMCreateAction; @@ -418,7 +417,6 @@ public class SliderAppMaster extends AbstractSliderLaunchedService */ public SliderAppMaster() { super(SERVICE_CLASSNAME_SHORT); - new HdfsConfiguration(); new YarnConfiguration(); } @@ -469,8 +467,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService UserGroupInformation.setConfiguration(conf); UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); log.debug("Authenticating as {}", ugi); - SliderUtils.verifyPrincipalSet(conf, - DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); + SliderUtils.verifyPrincipalSet(conf, DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY); } else { log.info("Cluster is insecure"); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java b/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java index 01cc5e5..63f66a3 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java @@ -17,14 +17,15 @@ package org.apache.slider.server.services.security; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier; import org.apache.hadoop.util.Time; +import org.apache.slider.common.SliderXmlConfKeys; import org.apache.slider.common.tools.SliderUtils; import org.apache.slider.server.appmaster.SliderAppMaster; import org.apache.slider.server.appmaster.actions.AsyncAction; @@ -63,15 +64,15 @@ public class FsDelegationTokenManager { private void createRemoteUser(Configuration configuration) throws IOException { Configuration loginConfig = new Configuration(configuration); - loginConfig.set(DFSConfigKeys.HADOOP_SECURITY_AUTHENTICATION, + loginConfig.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, "kerberos"); // using HDFS principal... this.remoteUser = UserGroupInformation .loginUserFromKeytabAndReturnUGI( SecurityUtil.getServerPrincipal( - loginConfig.get(DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY), + loginConfig.get(SliderXmlConfKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY), InetAddress.getLocalHost().getCanonicalHostName()), - loginConfig.get(DFSConfigKeys.DFS_NAMENODE_KEYTAB_FILE_KEY)); + loginConfig.get(SliderXmlConfKeys.DFS_NAMENODE_KEYTAB_FILE_KEY)); log.info("Created remote user {}. UGI reports current user is {}", this.remoteUser, UserGroupInformation.getCurrentUser()); } @@ -84,8 +85,8 @@ public class FsDelegationTokenManager { if (SliderUtils.isHadoopClusterSecure(configuration) && renewingAction == null) { renewInterval = configuration.getLong( - DFSConfigKeys.DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_KEY, - DFSConfigKeys.DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT); + SliderXmlConfKeys.DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_KEY, + SliderXmlConfKeys.DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT); // constructor of action will retrieve initial token. One may already be // associated with user, but its lifecycle/management is not clear so let's // create and manage a token explicitly http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy b/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy index a6d8538..72e7565 100644 --- a/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy @@ -23,7 +23,6 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path -import org.apache.hadoop.hdfs.DFSConfigKeys import org.apache.hadoop.yarn.conf.YarnConfiguration import org.apache.slider.api.ResourceKeys import org.apache.slider.api.RoleKeys @@ -132,7 +131,7 @@ class TestCommonArgParsing implements SliderActions, Arguments { SliderUtils.verifyPrincipalSet(conf, YarnConfiguration.RM_PRINCIPAL); SliderUtils.verifyPrincipalSet( conf, - DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY); + SliderXmlConfKeys.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY); } @@ -150,7 +149,7 @@ class TestCommonArgParsing implements SliderActions, Arguments { assert ca.clusterName == CLUSTERNAME assert conf.get(SliderXmlConfKeys.KEY_SLIDER_BASE_PATH) == "/projects/slider/clusters" SliderUtils.verifyPrincipalSet(conf, YarnConfiguration.RM_PRINCIPAL); - SliderUtils.verifyPrincipalSet(conf, DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY); + SliderUtils.verifyPrincipalSet(conf, SliderXmlConfKeys.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockContainerStatus.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockContainerStatus.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockContainerStatus.groovy index bfb00b0..4237f1e 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockContainerStatus.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockContainerStatus.groovy @@ -21,6 +21,7 @@ package org.apache.slider.server.appmaster.model.mock import org.apache.hadoop.yarn.api.records.ContainerId import org.apache.hadoop.yarn.api.records.ContainerState import org.apache.hadoop.yarn.api.records.ContainerStatus +import org.apache.hadoop.yarn.api.records.Resource class MockContainerStatus extends ContainerStatus { @@ -28,4 +29,6 @@ class MockContainerStatus extends ContainerStatus { ContainerState state String diagnostics int exitStatus + + Resource capability; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/test/groovy/org/apache/slider/server/services/security/TestFsDelegationTokenManager.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/services/security/TestFsDelegationTokenManager.groovy b/slider-core/src/test/groovy/org/apache/slider/server/services/security/TestFsDelegationTokenManager.groovy index 3de3c67..d82a79c 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/services/security/TestFsDelegationTokenManager.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/services/security/TestFsDelegationTokenManager.groovy @@ -20,9 +20,9 @@ package org.apache.slider.server.services.security import groovy.util.logging.Slf4j import org.apache.hadoop.conf.Configuration +import org.apache.hadoop.fs.CommonConfigurationKeysPublic import org.apache.hadoop.fs.FileSystem as HadoopFS import org.apache.hadoop.fs.RawLocalFileSystem -import org.apache.hadoop.hdfs.DFSConfigKeys import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier import org.apache.hadoop.io.Text import org.apache.hadoop.security.Credentials @@ -32,6 +32,7 @@ import org.apache.hadoop.security.token.Token import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager import org.apache.hadoop.service.ServiceOperations import org.apache.hadoop.util.Time +import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.common.tools.CoreFileSystem import org.apache.slider.server.appmaster.actions.ActionStopQueue import org.apache.slider.server.appmaster.actions.QueueExecutor @@ -60,10 +61,10 @@ class TestFsDelegationTokenManager { conf = new Configuration() conf.set( - DFSConfigKeys.HADOOP_SECURITY_AUTHENTICATION, + CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, "TOKEN") conf.setLong( - DFSConfigKeys.DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_KEY, + SliderXmlConfKeys.DFS_NAMENODE_DELEGATION_TOKEN_RENEW_INTERVAL_KEY, 1000) queues.init(conf) queues.start(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy index 9fb75df..faaf571 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy @@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileSystem as HadoopFS import org.apache.hadoop.fs.FileUtil import org.apache.hadoop.fs.Path -import org.apache.hadoop.hdfs.DFSConfigKeys import org.apache.hadoop.hdfs.MiniDFSCluster import org.apache.hadoop.service.ServiceOperations import org.apache.hadoop.util.Shell @@ -303,7 +302,7 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { conf.setFloat( YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE, 99.0f) - conf.setInt(DFSConfigKeys.DFS_NAMENODE_DU_RESERVED_KEY, 2 * 1024 * 1024) + conf.setInt(SliderXmlConfKeys.DFS_NAMENODE_DU_RESERVED_KEY, 2 * 1024 * 1024) } /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/fb38ea7c/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy index 4c02289..900b138 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy @@ -23,7 +23,6 @@ import org.apache.commons.lang.StringUtils import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileSystem as HadoopFS import org.apache.hadoop.fs.Path -import org.apache.hadoop.hdfs.HdfsConfiguration import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.hadoop.util.ExitUtil import org.apache.hadoop.util.Shell @@ -106,7 +105,6 @@ abstract class CommandTestBase extends SliderTestUtils { (which it may) the class will not be instantiable. */ static { - new HdfsConfiguration() ConfigHelper.injectSliderXMLResource() ConfigHelper.registerDeprecatedConfigItems(); SLIDER_CONFIG = ConfLoader.loadSliderConf(SLIDER_CONF_XML, true);
