Repository: incubator-slider Updated Branches: refs/heads/develop 0769354ee -> 6c4374392
SLIDER-504 migrate to new Registry constant, retaining the old one as a deprecated value (for tests, mainly) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9856b24e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9856b24e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9856b24e Branch: refs/heads/develop Commit: 9856b24e78e6408348514157d18eb0d24f438247 Parents: da67c44 Author: Steve Loughran <[email protected]> Authored: Mon Oct 13 16:19:25 2014 -0700 Committer: Steve Loughran <[email protected]> Committed: Mon Oct 13 16:19:25 2014 -0700 ---------------------------------------------------------------------- .../funtest/accumulo/AccumuloReadWriteIT.groovy | 4 +- .../accumulo/AccumuloReadWriteSSLIT.groovy | 4 +- .../org/apache/slider/client/SliderClient.java | 4 +- .../apache/slider/common/SliderXmlConfKeys.java | 2 +- .../slider/common/tools/ConfigHelper.java | 20 +++++- .../utility/AbstractSliderLaunchedService.java | 13 ++-- .../slider/common/tools/TestConfigHelper.groovy | 65 ++++++++++++++++++++ .../common/tools/TestConfigHelperHDFS.groovy | 20 ------ .../test/YarnZKMiniClusterTestBase.groovy | 2 +- .../agent/TestAgentProviderService.java | 13 ++-- .../funtest/framework/CommandTestBase.groovy | 5 +- .../funtest/basic/ClusterConnectivityIT.groovy | 4 +- .../lifecycle/ClusterBuildDestroyIT.groovy | 4 +- .../accumulo/funtest/AccumuloCIIT.groovy | 4 +- .../funtest/FunctionalHBaseClusterIT.groovy | 4 +- .../funtest/HBaseClusterBuildDestroyIT.groovy | 4 +- 16 files changed, 123 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy index ca00a6c..12a3bff 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteIT.groovy @@ -25,6 +25,7 @@ import org.apache.accumulo.core.client.ZooKeeperInstance import org.apache.accumulo.core.client.security.tokens.PasswordToken import org.apache.accumulo.test.TestIngest import org.apache.accumulo.test.VerifyIngest +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.slider.api.ClusterDescription import org.apache.slider.client.SliderClient import org.apache.slider.common.SliderXmlConfKeys @@ -48,7 +49,8 @@ class AccumuloReadWriteIT extends AccumuloBasicIT { @Override public void clusterLoadOperations(ClusterDescription cd, SliderClient sliderClient) { try { - String zookeepers = SLIDER_CONFIG.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, + String zookeepers = SLIDER_CONFIG.get( + RegistryConstants.KEY_REGISTRY_ZK_QUORUM, FuntestProperties.DEFAULT_SLIDER_ZK_HOSTS) ZooKeeperInstance instance = new ZooKeeperInstance( http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy index 6f27301..cc227ed 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloReadWriteSSLIT.groovy @@ -21,6 +21,7 @@ import org.apache.accumulo.core.client.ClientConfiguration import org.apache.accumulo.core.client.Connector import org.apache.accumulo.core.client.ZooKeeperInstance import org.apache.accumulo.core.client.security.tokens.PasswordToken +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.slider.api.ClusterDescription import org.apache.slider.client.SliderClient import org.apache.slider.common.SliderXmlConfKeys @@ -42,7 +43,8 @@ class AccumuloReadWriteSSLIT extends AccumuloSSLTestBase { } public ZooKeeperInstance getInstance() { - String zookeepers = SLIDER_CONFIG.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, + String zookeepers = SLIDER_CONFIG.get( + RegistryConstants.KEY_REGISTRY_ZK_QUORUM, FuntestProperties.DEFAULT_SLIDER_ZK_HOSTS) ClientConfiguration conf = new ClientConfiguration() .withInstance(tree.global.get("site.global.accumulo_instance_name")) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/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 78f214e..750bfaa 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 @@ -1234,8 +1234,8 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe addConfOptionToCLI(commandLine, config, REGISTRY_PATH, DEFAULT_REGISTRY_PATH); - addMandatoryConfOptionToCLI(commandLine, config, RegistryConstants.KEY_REGISTRY_ZK_QUORUM); - addMandatoryConfOptionToCLI(commandLine, config, REGISTRY_ZK_QUORUM); + addMandatoryConfOptionToCLI(commandLine, config, + RegistryConstants.KEY_REGISTRY_ZK_QUORUM); if (clusterSecure) { // if the cluster is secure, make sure that http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/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 cc2a03f..000511f 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 @@ -123,7 +123,7 @@ public interface SliderXmlConfKeys { String DEFAULT_DATA_DIRECTORY_PERMISSIONS = "750"; - String REGISTRY_PATH = RegistryConstants.KEY_REGISTRY_ZK_ROOT; + String REGISTRY_PATH = "slider.registry.path"; /** * Default value for the registry: {@value} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java b/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java index b7e1323..31acb94 100644 --- a/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java +++ b/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java @@ -25,6 +25,7 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; +import org.apache.hadoop.registry.client.api.RegistryConstants; import org.apache.slider.common.SliderKeys; import org.apache.slider.common.SliderXmlConfKeys; import org.apache.slider.core.exceptions.BadConfigException; @@ -48,6 +49,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; import java.util.Map; +import java.util.Set; import java.util.TreeSet; /** @@ -65,15 +67,14 @@ public class ConfigHelper { * @param conf config * @return the sorted keyset */ - public static TreeSet<String> dumpConf(Configuration conf) { - TreeSet<String> keys = sortedConfigKeys(conf); + public static Set<String> dumpConf(Configuration conf) { + Set<String> keys = sortedConfigKeys(conf); for (String key : keys) { log.info("{}={}", key, conf.get(key)); } return keys; } - /** * Take a configuration and return a sorted set * @param conf config @@ -561,4 +562,17 @@ public class ConfigHelper { } return result; } + + /** + * Register anything we consider deprecated + */ + public static void registerDeprecatedConfigItems() { + Configuration.addDeprecation( + SliderXmlConfKeys.REGISTRY_ZK_QUORUM, + RegistryConstants.KEY_REGISTRY_ZK_QUORUM); + Configuration.addDeprecation( + SliderXmlConfKeys.REGISTRY_PATH, + RegistryConstants.KEY_REGISTRY_ZK_ROOT); + + } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java index acdb882..10af3d3 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java @@ -18,11 +18,13 @@ package org.apache.slider.server.services.utility; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.registry.client.api.RegistryConstants; import org.apache.hadoop.registry.client.api.RegistryOperations; import org.apache.hadoop.registry.client.api.RegistryOperationsFactory; import org.apache.slider.common.SliderXmlConfKeys; +import org.apache.slider.common.tools.ConfigHelper; import org.apache.slider.common.tools.SliderUtils; import org.apache.slider.core.exceptions.BadCommandArgumentsException; import org.apache.slider.core.exceptions.BadConfigException; @@ -41,7 +43,8 @@ public abstract class AbstractSliderLaunchedService extends public AbstractSliderLaunchedService(String name) { super(name); // make sure all the yarn configs get loaded - new YarnConfiguration(); + YarnConfiguration conf = new YarnConfiguration(); + ConfigHelper.registerDeprecatedConfigItems(); } /** @@ -50,14 +53,9 @@ public abstract class AbstractSliderLaunchedService extends * @throws BadConfigException if it is not there or invalid */ public String lookupZKQuorum() throws BadConfigException { - // YARN registry first + String registryQuorum = getConfig().get(RegistryConstants.KEY_REGISTRY_ZK_QUORUM); - // slider value can overrride it - registryQuorum = getConfig().get( - SliderXmlConfKeys.REGISTRY_ZK_QUORUM, - registryQuorum); - // though if neither is set: trouble if (SliderUtils.isUnset(registryQuorum)) { throw new BadConfigException( @@ -79,7 +77,6 @@ public abstract class AbstractSliderLaunchedService extends // push back the slider registry entry if needed String quorum = lookupZKQuorum(); - getConfig().set(RegistryConstants.KEY_REGISTRY_ZK_QUORUM, quorum); RegistryOperations registryWriterService = createRegistryOperationsInstance(); deployChildService(registryWriterService); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelper.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelper.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelper.groovy new file mode 100644 index 0000000..bdab926 --- /dev/null +++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelper.groovy @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.slider.common.tools + +import groovy.transform.CompileStatic +import groovy.util.logging.Slf4j +import org.apache.hadoop.conf.Configuration +import org.apache.hadoop.registry.client.api.RegistryConstants +import org.apache.slider.common.SliderXmlConfKeys +import org.apache.slider.test.YarnMiniClusterTestBase +import org.junit.Test + +@Slf4j +@CompileStatic + +class TestConfigHelper extends YarnMiniClusterTestBase { + + + @Test + public void testConfigLoaderIteration() throws Throwable { + + String xml = + """<?xml version="1.0" encoding="UTF-8" standalone="no"?><configuration> +<property><name>key</name><value>value</value><source>programatically</source></property> +</configuration> + """ + InputStream ins = new ByteArrayInputStream(xml.bytes); + Configuration conf = new Configuration(false); + conf.addResource(ins); + Configuration conf2 = new Configuration(false); + for (Map.Entry<String, String> entry : conf) { + conf2.set(entry.key, entry.value, "src") + } + + } + + @Test + public void testConfigDeprecation() throws Throwable { + ConfigHelper.registerDeprecatedConfigItems() + Configuration conf = new Configuration(false); + conf.set(SliderXmlConfKeys.REGISTRY_PATH, "path") + assert "path" == conf.get(SliderXmlConfKeys.REGISTRY_PATH) + assert "path" == conf.get(RegistryConstants.KEY_REGISTRY_ZK_ROOT) + + conf.set(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, "localhost") + assert "localhost" == conf.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM) + assert "localhost" == conf.get(RegistryConstants.KEY_REGISTRY_ZK_QUORUM) + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelperHDFS.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelperHDFS.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelperHDFS.groovy index d78aa1b..6558437 100644 --- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelperHDFS.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestConfigHelperHDFS.groovy @@ -32,7 +32,6 @@ import org.junit.Test class TestConfigHelperHDFS extends YarnMiniClusterTestBase { - //diabled for now; @Test public void testConfigHelperHDFS() throws Throwable { YarnConfiguration config = getConfiguration() @@ -51,23 +50,4 @@ class TestConfigHelperHDFS extends YarnMiniClusterTestBase { assert loaded.get("key") == "value" } - @Test - public void testConfigLoaderIteration() throws Throwable { - - String xml = - """<?xml version="1.0" encoding="UTF-8" standalone="no"?><configuration> -<property><name>key</name><value>value</value><source>programatically</source></property> -</configuration> - """ - InputStream ins = new ByteArrayInputStream(xml.bytes); - Configuration conf = new Configuration(false); - conf.addResource(ins); - Configuration conf2 = new Configuration(false); - for (Map.Entry<String, String> entry : conf) { - String key = entry.getKey(); - String val = entry.getValue(); - conf2.set(key, val, "src") - } - - } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy index e182ed2..3fae9fd 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnZKMiniClusterTestBase.groovy @@ -160,7 +160,7 @@ public abstract class YarnZKMiniClusterTestBase extends YarnMiniClusterTestBase */ protected List<String> getExtraCLIArgs() { [ - "-D", define(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, ZKBinding) + "-D", define(RegistryConstants.KEY_REGISTRY_ZK_QUORUM, ZKBinding) ] } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java index addfc8a..7eff45a 100644 --- a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java +++ b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java @@ -22,6 +22,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FilterFileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.registry.client.api.RegistryConstants; import org.apache.hadoop.registry.client.api.RegistryOperations; import org.apache.hadoop.registry.client.types.ServiceRecord; import org.apache.hadoop.yarn.api.records.Container; @@ -299,8 +300,8 @@ public class TestAgentProviderService { doReturn(metainfo).when(mockAps).getApplicationMetainfo(any(SliderFileSystem.class), anyString()); Configuration conf = new Configuration(); - conf.set(SliderXmlConfKeys.REGISTRY_PATH, - SliderXmlConfKeys.DEFAULT_REGISTRY_PATH); + conf.set(RegistryConstants.KEY_REGISTRY_ZK_ROOT, + RegistryConstants.DEFAULT_ZK_REGISTRY_ROOT); try { doReturn(true).when(mockAps).isMaster(anyString()); @@ -427,7 +428,9 @@ public class TestAgentProviderService { expect(container.getPriority()).andReturn(Priority.newInstance(1)); StateAccessForProviders access = createNiceMock(StateAccessForProviders.class); - AgentProviderService aps = createAgentProviderService(new Configuration()); + Configuration conf = new Configuration(); + + AgentProviderService aps = createAgentProviderService(conf); AgentProviderService mockAps = Mockito.spy(aps); doReturn(access).when(mockAps).getAmState(); @@ -442,9 +445,7 @@ public class TestAgentProviderService { any(SliderFileSystem.class), anyString()); doReturn(metainfo).when(mockAps).getMetainfo(); - Configuration conf = new Configuration(); - conf.set(SliderXmlConfKeys.REGISTRY_PATH, - SliderXmlConfKeys.DEFAULT_REGISTRY_PATH); + try { doReturn(true).when(mockAps).isMaster(anyString()); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/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 db1c562..7f3c43d 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 @@ -22,9 +22,11 @@ import groovy.transform.CompileStatic import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileSystem as HadoopFS import org.apache.hadoop.fs.Path +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.hadoop.util.ExitUtil import org.apache.hadoop.util.Shell import org.apache.hadoop.yarn.conf.YarnConfiguration +import org.apache.slider.common.tools.ConfigHelper import org.apache.slider.core.main.LauncherExitCodes import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.common.SliderKeys @@ -81,6 +83,7 @@ abstract class CommandTestBase extends SliderTestUtils { static { + ConfigHelper.registerDeprecatedConfigItems(); SLIDER_CONFIG = ConfLoader.loadSliderConf(SLIDER_CONF_XML); THAW_WAIT_TIME = getTimeOptionMillis(SLIDER_CONFIG, KEY_TEST_THAW_WAIT_TIME, @@ -436,7 +439,7 @@ abstract class CommandTestBase extends SliderTestUtils { List<String> argsList = [action, clustername] argsList << ARG_ZKHOSTS << - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.REGISTRY_ZK_QUORUM) + SLIDER_CONFIG.getTrimmed(RegistryConstants.KEY_REGISTRY_ZK_QUORUM) if (blockUntilRunning) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy index 9b8fe6f..b09e8b7 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy @@ -21,6 +21,7 @@ package org.apache.slider.funtest.basic import groovy.util.logging.Slf4j import org.apache.hadoop.fs.Path import org.apache.hadoop.net.NetUtils +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.hadoop.yarn.conf.YarnConfiguration import org.apache.slider.client.SliderYarnClientImpl import org.apache.slider.common.SliderXmlConfKeys @@ -52,7 +53,8 @@ class ClusterConnectivityIT extends CommandTestBase { @Test public void testZKBinding() throws Throwable { - def quorum = SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.REGISTRY_ZK_QUORUM) + def quorum = SLIDER_CONFIG.getTrimmed( + RegistryConstants.KEY_REGISTRY_ZK_QUORUM) assert quorum def tuples = ZookeeperUtils.splitToHostsAndPortsStrictly(quorum); tuples.each { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy index c5dbecb..e53473a 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy @@ -21,6 +21,7 @@ package org.apache.slider.funtest.lifecycle import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.fs.Path +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.slider.common.SliderExitCodes import org.apache.slider.common.SliderKeys import org.apache.slider.common.SliderXmlConfKeys @@ -62,7 +63,8 @@ public class ClusterBuildDestroyIT extends AgentCommandTestBase ACTION_BUILD, CLUSTER, ARG_ZKHOSTS, - SLIDER_CONFIG.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, DEFAULT_SLIDER_ZK_HOSTS), + SLIDER_CONFIG.get( + RegistryConstants.KEY_REGISTRY_ZK_QUORUM, DEFAULT_SLIDER_ZK_HOSTS), ARG_TEMPLATE, APP_TEMPLATE, ARG_RESOURCES, APP_RESOURCE ]) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy index 4ec5ff1..bef5a03 100644 --- a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy +++ b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy @@ -25,6 +25,7 @@ import org.apache.accumulo.test.continuous.ContinuousIngest import org.apache.accumulo.test.continuous.ContinuousVerify import org.apache.hadoop.fs.Path import org.apache.hadoop.io.Text +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.hadoop.util.ToolRunner import org.apache.hadoop.yarn.conf.YarnConfiguration import org.apache.slider.common.SliderXmlConfKeys @@ -59,7 +60,8 @@ class AccumuloCIIT extends FunctionalAccumuloClusterIT { assert clustername String currentUser = System.getProperty("user.name"); - String zookeepers = SLIDER_CONFIG.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, + String zookeepers = SLIDER_CONFIG.get( + RegistryConstants.KEY_REGISTRY_ZK_QUORUM, FuntestProperties.DEFAULT_SLIDER_ZK_HOSTS) ZooKeeperInstance inst = new ZooKeeperInstance(currentUser + "-" + clustername, zookeepers) Connector conn = inst.getConnector("root", new PasswordToken(getPassword())) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy index 3b8d1f9..936c616 100644 --- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy +++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/FunctionalHBaseClusterIT.groovy @@ -21,6 +21,7 @@ package org.apache.slider.providers.hbase.funtest import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.conf.Configuration +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.hadoop.yarn.conf.YarnConfiguration import org.apache.slider.api.ClusterDescription import org.apache.slider.api.RoleKeys @@ -66,7 +67,8 @@ public class FunctionalHBaseClusterIT extends HBaseCommandTestBase @Before public void prepareCluster() { - String quorumServers = SLIDER_CONFIG.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, DEFAULT_SLIDER_ZK_HOSTS) + String quorumServers = SLIDER_CONFIG.get( + RegistryConstants.KEY_REGISTRY_ZK_QUORUM, DEFAULT_SLIDER_ZK_HOSTS) ZooKeeper monitor = new ZooKeeper(quorumServers, 1000, new Watcher(){ http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9856b24e/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterBuildDestroyIT.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterBuildDestroyIT.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterBuildDestroyIT.groovy index 3a44e30..63672d6 100644 --- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterBuildDestroyIT.groovy +++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterBuildDestroyIT.groovy @@ -21,6 +21,7 @@ package org.apache.slider.providers.hbase.funtest import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.fs.Path +import org.apache.hadoop.registry.client.api.RegistryConstants import org.apache.slider.common.SliderKeys import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.common.params.Arguments @@ -62,7 +63,8 @@ public class HBaseClusterBuildDestroyIT extends HBaseCommandTestBase CLUSTER, ARG_PROVIDER, HBaseKeys.PROVIDER_HBASE, ARG_ZKHOSTS, - SLIDER_CONFIG.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, DEFAULT_SLIDER_ZK_HOSTS), + SLIDER_CONFIG.get( + RegistryConstants.KEY_REGISTRY_ZK_QUORUM, DEFAULT_SLIDER_ZK_HOSTS), ARG_IMAGE, SLIDER_CONFIG.get(KEY_TEST_HBASE_TAR), ARG_CONFDIR,
