SLIDER-637 purge ZKInstance uses in the accumulo and hbase providers
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/62c87ec9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/62c87ec9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/62c87ec9 Branch: refs/heads/releases/slider-0.60 Commit: 62c87ec98dee5f0755dd54ca8f8918e461adc3b3 Parents: d556971 Author: Steve Loughran <[email protected]> Authored: Tue Nov 11 13:33:39 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Nov 11 15:04:36 2014 +0000 ---------------------------------------------------------------------- .../live/TestAccCorrectInstanceName.groovy | 17 +++-------------- .../accumulo/live/TestAccFreezeThaw.groovy | 6 +----- .../accumulo/live/TestAccLiveHDFSArchive.groovy | 8 ++------ .../accumulo/live/TestAccLiveLocalArchive.groovy | 8 ++------ .../accumulo/live/TestAccM1T1GC1Mon1.groovy | 8 ++------ .../accumulo/live/TestAccM2T2GC1Mon1.groovy | 8 ++------ .../accumulo/live/TestAccumuloAMWebApp.groovy | 10 +++------- .../accumulo/live/TestInvalidMonitorAddress.groovy | 10 +++++----- .../hbase/minicluster/live/Test2Master2RS.groovy | 6 +++--- .../hbase/minicluster/live/TestHBaseMaster.groovy | 11 ++++------- .../minicluster/live/TestHBaseMasterOnHDFS.groovy | 2 +- .../live/TestLiveRegionServiceOnHDFS.groovy | 5 +---- .../live/TestLiveTwoNodeRegionService.groovy | 6 +++--- .../minicluster/live/TestTwoLiveClusters.groovy | 6 +++--- 14 files changed, 35 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy index 2333fdf..1f1b726 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccCorrectInstanceName.groovy @@ -20,17 +20,13 @@ package org.apache.slider.providers.accumulo.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -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.yarn.api.records.YarnApplicationState -import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.api.ClusterDescription -import org.apache.slider.providers.accumulo.AccumuloKeys -import org.apache.slider.common.params.Arguments import org.apache.slider.client.SliderClient +import org.apache.slider.common.params.Arguments +import org.apache.slider.core.main.ServiceLauncher +import org.apache.slider.providers.accumulo.AccumuloKeys import org.apache.slider.providers.accumulo.AccumuloTestBase -import org.apache.slider.core.zk.ZKIntegration import org.junit.Test @CompileStatic @@ -47,8 +43,6 @@ class TestAccCorrectInstanceName extends AccumuloTestBase { describe(" Create an accumulo cluster"); //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) - log.info("ZK up at $zki"); //now launch the cluster Map<String, Integer> roles = [ (AccumuloKeys.ROLE_MASTER): 1, @@ -79,11 +73,6 @@ class TestAccCorrectInstanceName extends AccumuloTestBase { //verify that all is still there waitForRoleCount(sliderClient, roles, 0) - // Making the connector validates that the instance name is correct, we have the right zk, - // and the proper username and password were created in accumulo - ZooKeeperInstance instance = new ZooKeeperInstance(System.getProperty("user.name") + "-" + clustername, zki.getConnectionString()); - Connector c = instance.getConnector("root", new PasswordToken(password)); - log.info("Finishing") status = sliderClient.getClusterDescription(clustername) log.info(prettyPrint(status.toJsonString())) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy index fcb73e0..f55b73e 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccFreezeThaw.groovy @@ -21,12 +21,11 @@ package org.apache.slider.providers.accumulo.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.FinalApplicationStatus +import org.apache.slider.client.SliderClient import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions import org.apache.slider.providers.accumulo.AccumuloKeys -import org.apache.slider.client.SliderClient import org.apache.slider.providers.accumulo.AccumuloTestBase -import org.apache.slider.core.zk.ZKIntegration import org.junit.Test @CompileStatic @@ -42,9 +41,6 @@ class TestAccFreezeThaw extends AccumuloTestBase { configuration, 1, 1, 1, true, false) describe(" Create an accumulo cluster"); - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) - log.info("ZK up at $zki"); //now launch the cluster Map<String, Integer> roles = [ (AccumuloKeys.ROLE_MASTER): 1, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy index 8d5890c..ecb9062 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveHDFSArchive.groovy @@ -21,13 +21,12 @@ package org.apache.slider.providers.accumulo.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.YarnApplicationState -import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.api.ClusterDescription +import org.apache.slider.client.SliderClient +import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions import org.apache.slider.providers.accumulo.AccumuloKeys -import org.apache.slider.client.SliderClient import org.apache.slider.providers.accumulo.AccumuloTestBase -import org.apache.slider.core.zk.ZKIntegration import org.junit.Test @CompileStatic @@ -44,9 +43,6 @@ class TestAccLiveHDFSArchive extends AccumuloTestBase { describe(" Create an accumulo cluster from an archive"); enableTestRunAgainstUploadedArchive(); - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) - log.info("ZK up at $zki"); //now launch the cluster Map<String, Integer> roles = [ (AccumuloKeys.ROLE_MASTER): 1, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy index df0bbd9..997fa19 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccLiveLocalArchive.groovy @@ -21,13 +21,12 @@ package org.apache.slider.providers.accumulo.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.YarnApplicationState -import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.api.ClusterDescription +import org.apache.slider.client.SliderClient +import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions import org.apache.slider.providers.accumulo.AccumuloKeys -import org.apache.slider.client.SliderClient import org.apache.slider.providers.accumulo.AccumuloTestBase -import org.apache.slider.core.zk.ZKIntegration import org.junit.Test @CompileStatic @@ -46,9 +45,6 @@ class TestAccLiveLocalArchive extends AccumuloTestBase { //image mode switchToImageDeploy = true - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) - log.info("ZK up at $zki"); //now launch the cluster Map<String, Integer> roles = [ (AccumuloKeys.ROLE_MASTER): 1, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy index d94eb36..586c4c0 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM1T1GC1Mon1.groovy @@ -21,12 +21,11 @@ package org.apache.slider.providers.accumulo.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.YarnApplicationState -import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.api.ClusterDescription -import org.apache.slider.providers.accumulo.AccumuloKeys import org.apache.slider.client.SliderClient +import org.apache.slider.core.main.ServiceLauncher +import org.apache.slider.providers.accumulo.AccumuloKeys import org.apache.slider.providers.accumulo.AccumuloTestBase -import org.apache.slider.core.zk.ZKIntegration import org.junit.Test @CompileStatic @@ -41,9 +40,6 @@ class TestAccM1T1GC1Mon1 extends AccumuloTestBase { String clustername = createMiniCluster( "", configuration, 1, 1, 1, true, false) describe(" Create an accumulo cluster"); - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) - log.info("ZK up at $zki"); //now launch the cluster Map<String, Integer> roles = [ (AccumuloKeys.ROLE_MASTER): 1, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy index 2ed50f1..804d29d 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccM2T2GC1Mon1.groovy @@ -21,13 +21,12 @@ package org.apache.slider.providers.accumulo.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.YarnApplicationState -import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.api.ClusterDescription +import org.apache.slider.client.SliderClient +import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions import org.apache.slider.providers.accumulo.AccumuloKeys -import org.apache.slider.client.SliderClient import org.apache.slider.providers.accumulo.AccumuloTestBase -import org.apache.slider.core.zk.ZKIntegration import org.junit.Test @CompileStatic @@ -44,9 +43,6 @@ class TestAccM2T2GC1Mon1 extends AccumuloTestBase { "", configuration, 1, 1, 1, true, false) describe(" Create an accumulo cluster"); - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) - log.info("ZK up at $zki"); //now launch the cluster Map<String, Integer> roles = [ (AccumuloKeys.ROLE_MASTER): master, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy index 4596b12..7afcd0f 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestAccumuloAMWebApp.groovy @@ -22,14 +22,13 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.ApplicationReport import org.apache.hadoop.yarn.api.records.YarnApplicationState -import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.api.ClusterDescription +import org.apache.slider.client.SliderClient +import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.accumulo.AccumuloConfigFileOptions import org.apache.slider.providers.accumulo.AccumuloKeys -import org.apache.slider.server.appmaster.web.SliderAMWebApp -import org.apache.slider.client.SliderClient import org.apache.slider.providers.accumulo.AccumuloTestBase -import org.apache.slider.core.zk.ZKIntegration +import org.apache.slider.server.appmaster.web.SliderAMWebApp import org.junit.Test @CompileStatic @@ -45,9 +44,6 @@ class TestAccumuloAMWebApp extends AccumuloTestBase { configuration, 1, 1, 1, true, false) describe(" Create an accumulo cluster"); - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) - log.info("ZK up at $zki"); //now launch the cluster Map<String, Integer> roles = [ (AccumuloKeys.ROLE_MASTER): 1, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy index dca0c6b..a07ddc9 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/live/TestInvalidMonitorAddress.groovy @@ -20,14 +20,14 @@ package org.apache.slider.providers.accumulo.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.slider.core.main.ServiceLaunchException -import org.apache.slider.core.main.ServiceLauncher -import org.apache.slider.common.SliderExitCodes import org.apache.slider.api.ClusterDescription import org.apache.slider.api.RoleKeys -import org.apache.slider.providers.accumulo.AccumuloKeys -import org.apache.slider.common.params.Arguments import org.apache.slider.client.SliderClient +import org.apache.slider.common.SliderExitCodes +import org.apache.slider.common.params.Arguments +import org.apache.slider.core.main.ServiceLaunchException +import org.apache.slider.core.main.ServiceLauncher +import org.apache.slider.providers.accumulo.AccumuloKeys import org.apache.slider.providers.accumulo.AccumuloTestBase import org.junit.Test http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy index 47f5e1c..10a502b 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy @@ -22,11 +22,11 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.conf.Configuration import org.apache.hadoop.hbase.ClusterStatus -import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.api.ClusterDescription -import org.apache.slider.providers.hbase.HBaseTestUtils -import org.apache.slider.common.tools.Duration import org.apache.slider.client.SliderClient +import org.apache.slider.common.tools.Duration +import org.apache.slider.core.main.ServiceLauncher +import org.apache.slider.providers.hbase.HBaseTestUtils import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase import org.junit.Test http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy index 79193c3..db102cb 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy @@ -23,17 +23,16 @@ import groovy.util.logging.Slf4j import org.apache.hadoop.registry.client.binding.RegistryUtils import org.apache.hadoop.registry.client.types.ServiceRecord import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes -import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.api.ClusterDescription import org.apache.slider.api.RoleKeys +import org.apache.slider.client.SliderClient +import org.apache.slider.common.SliderXmlConfKeys +import org.apache.slider.common.params.Arguments +import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.core.registry.docstore.PublishedConfigSet import org.apache.slider.core.registry.retrieve.RegistryRetriever import org.apache.slider.providers.hbase.HBaseKeys -import org.apache.slider.core.zk.ZKIntegration -import org.apache.slider.common.params.Arguments -import org.apache.slider.client.SliderClient import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase -import org.apache.slider.core.main.ServiceLauncher import org.junit.Test /** @@ -47,8 +46,6 @@ class TestHBaseMaster extends HBaseMiniClusterTestBase { @Test public void testHBaseMaster() throws Throwable { String clustername = createMiniCluster("", configuration, 1, true) - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) //now launch the cluster with 1 region server int regionServerCount = 1 ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy index 7f51f95..5e8adca 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy @@ -22,8 +22,8 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.slider.api.ClusterDescription import org.apache.slider.client.SliderClient -import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase import org.apache.slider.core.main.ServiceLauncher +import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase import org.junit.Test /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy index 957d167..1392535 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy @@ -22,10 +22,9 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.hbase.ClusterStatus import org.apache.slider.api.ClusterDescription -import org.apache.slider.core.zk.ZKIntegration import org.apache.slider.client.SliderClient -import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase import org.apache.slider.core.main.ServiceLauncher +import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase import org.junit.Test /** @@ -42,8 +41,6 @@ class TestLiveRegionServiceOnHDFS extends HBaseMiniClusterTestBase { "", configuration, 1, 1, 1, true, true) describe(" Create a single region service cluster"); - //make sure that ZK is up and running at the binding string - ZKIntegration zki = createZKIntegrationInstance(ZKBinding, clustername, false, false, 5000) //now launch the cluster ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount, [], true, true) SliderClient sliderClient = launcher.service http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy index 3561d2f..f10e296 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveTwoNodeRegionService.groovy @@ -23,11 +23,11 @@ import groovy.util.logging.Slf4j import org.apache.hadoop.hbase.ClusterStatus import org.apache.slider.api.ClusterDescription import org.apache.slider.api.RoleKeys -import org.apache.slider.providers.hbase.HBaseKeys -import org.apache.slider.common.params.Arguments import org.apache.slider.client.SliderClient -import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase +import org.apache.slider.common.params.Arguments import org.apache.slider.core.main.ServiceLauncher +import org.apache.slider.providers.hbase.HBaseKeys +import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase import org.junit.Test /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/62c87ec9/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy index b7212d9..029f424 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy @@ -21,15 +21,15 @@ package org.apache.slider.providers.hbase.minicluster.live import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.hadoop.registry.client.api.RegistryOperations -import org.apache.hadoop.registry.client.binding.RegistryUtils import org.apache.hadoop.registry.client.binding.RegistryPathUtils +import org.apache.hadoop.registry.client.binding.RegistryUtils import org.apache.hadoop.registry.client.types.ServiceRecord +import org.apache.slider.client.SliderClient import org.apache.slider.common.SliderKeys import org.apache.slider.common.params.Arguments -import org.apache.slider.client.SliderClient +import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.hbase.HBaseKeys import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase -import org.apache.slider.core.main.ServiceLauncher import org.junit.Test @CompileStatic
