You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/14 16:19:40 UTC
svn commit: r1594585 [2/2] - in /incubator/slider/trunk:
slider-core/src/main/java/org/apache/slider/common/
slider-core/src/main/java/org/apache/slider/common/params/
slider-core/src/main/java/org/apache/slider/common/tools/
slider-core/src/main/java/...
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy Wed May 14 14:19:38 2014
@@ -64,7 +64,7 @@ public abstract class HBaseMiniClusterTe
@Override
void setup() {
super.setup()
- def testConf = getTestConfiguration()
+ def testConf = testConfiguration
assumeBoolOption(testConf, KEY_TEST_HBASE_ENABLED, true)
assumeArchiveDefined();
assumeApplicationHome();
@@ -280,7 +280,7 @@ public abstract class HBaseMiniClusterTe
int workers,
int flexTarget,
boolean testHBaseAfter) {
- createMiniCluster(clustername, getConfiguration(),
+ createMiniCluster(clustername, configuration,
1,
true);
//now launch the cluster
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy Wed May 14 14:19:38 2014
@@ -57,7 +57,7 @@ class TestFreezeThawClusterFromArchive e
killAllRegionServers();
//now let's start the cluster up again
- ServiceLauncher launcher2 = thawCluster(clustername, [], true);
+ ServiceLauncher<SliderClient> launcher2 = thawCluster(clustername, [], true);
SliderClient newCluster = launcher2.service
basicHBaseClusterStartupSequence(newCluster)
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestLiveClusterFromArchive.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestLiveClusterFromArchive.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestLiveClusterFromArchive.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestLiveClusterFromArchive.groovy Wed May 14 14:19:38 2014
@@ -37,16 +37,21 @@ class TestLiveClusterFromArchive extends
@Test
public void testLiveClusterFromArchive() throws Throwable {
- String clustername = getTestClusterName()
+ String clustername = testClusterName
int regionServerCount = 1
- createMiniCluster(clustername, getConfiguration(), regionServerCount + 1, 1, 1, true,
- startHDFS())
+ createMiniCluster(clustername,
+ configuration,
+ regionServerCount + 1,
+ 1,
+ 1,
+ true,
+ startHDFS())
//now launch the cluster
setupImageToDeploy()
- ServiceLauncher launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ SliderClient sliderClient = launcher.service
ClusterStatus clustat = basicHBaseClusterStartupSequence(sliderClient)
//get the hbase status
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy Wed May 14 14:19:38 2014
@@ -39,11 +39,11 @@ class TestBuildThawClusterM1W1 extends H
@Test
public void test_build_thaw_cluster_m1_w1() throws Throwable {
String clustername = "test_build_thaw_cluster_m1_w1"
- createMiniCluster(clustername, getConfiguration(), 1, true)
+ createMiniCluster(clustername, configuration, 1, true)
describe "verify that a built cluster can be thawed"
- ServiceLauncher launcher = createOrBuildCluster(
+ ServiceLauncher<SliderClient> launcher = createOrBuildCluster(
SliderActions.ACTION_BUILD,
clustername,
[
@@ -56,17 +56,17 @@ class TestBuildThawClusterM1W1 extends H
true,
false,
[:])
- SliderClient sliderClient = (SliderClient) launcher.service
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
def serviceRegistryClient = sliderClient.YARNRegistryClient
ApplicationReport report = serviceRegistryClient.findInstance(clustername)
assert report == null;
//thaw time
- ServiceLauncher l2 = thawCluster(clustername, [], true)
- SliderClient client2 = (SliderClient) l2.service
- addToTeardown(client2);
- waitForClusterLive(l2.service as SliderClient)
+ ServiceLauncher<SliderClient> l2 = thawCluster(clustername, [], true)
+ SliderClient thawed = l2.service
+ addToTeardown(thawed);
+ waitForClusterLive(thawed)
}
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailedRegionService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailedRegionService.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailedRegionService.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailedRegionService.groovy Wed May 14 14:19:38 2014
@@ -51,12 +51,12 @@ class TestFailedRegionService extends HB
String clustername = testName
String action = toKill ? "kill" : "stop"
int regionServerCount = 2
- createMiniCluster(clustername, getConfiguration(), 1, 1, 1, true, true)
+ createMiniCluster(clustername, configuration, 1, 1, 1, true, true)
describe("Create a single region service cluster then " + action + " the RS");
//now launch the cluster
- ServiceLauncher launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
@@ -90,7 +90,7 @@ class TestFailedRegionService extends HB
hbaseStat = waitForHBaseRegionServerCount(sliderClient, clustername, regionServerCount, hbaseClusterStartupToLiveTime)
- status = sliderClient.getClusterDescription()
+ status = sliderClient.clusterDescription
assert status.roles[HBaseKeys.ROLE_WORKER][RoleKeys.ROLE_FAILED_INSTANCES] == "2"
log.info("Updated cluster status : ${hbaseStatusToString(hbaseStat)}");
@@ -107,7 +107,7 @@ class TestFailedRegionService extends HB
sliderClient,
regionServerCount,
hbaseClusterStartupToLiveTime)
- status = sliderClient.getClusterDescription()
+ status = sliderClient.clusterDescription
assert status.roles[HBaseKeys.ROLE_WORKER][RoleKeys.ROLE_FAILED_INSTANCES] == "3"
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailureThreshold.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailureThreshold.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailureThreshold.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestFailureThreshold.groovy Wed May 14 14:19:38 2014
@@ -68,7 +68,8 @@ class TestFailureThreshold extends HBase
regionServerCount,
[
Arguments.ARG_OPTION, OptionKeys.INTERNAL_CONTAINER_FAILURE_THRESHOLD,
- Integer.toString(threshold)],
+ Integer.toString(threshold)
+ ],
true,
true)
SliderClient client = launcher.service
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseMaster.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseMaster.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseMaster.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseMaster.groovy Wed May 14 14:19:38 2014
@@ -42,12 +42,12 @@ class TestKilledHBaseMaster extends HBas
public void testKilledHBaseMaster() throws Throwable {
String clustername = "test_killed_hbase_master"
int regionServerCount = 1
- createMiniCluster(clustername, getConfiguration(), 1, 1, 1, true, true)
+ createMiniCluster(clustername, configuration, 1, 1, 1, true, true)
describe("Kill the hbase master and expect a restart");
//now launch the cluster
- ServiceLauncher launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To1.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To1.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To1.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To1.groovy Wed May 14 14:19:38 2014
@@ -38,8 +38,7 @@ class TestClusterFlex1To1 extends HBaseM
1,
1,
1,
- 1
- ,
+ 1,
true)
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To2.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To2.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To2.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex1To2.groovy Wed May 14 14:19:38 2014
@@ -37,8 +37,7 @@ class TestClusterFlex1To2 extends HBaseM
1,
1,
1,
- 2
- ,
+ 2,
true)
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2DownTo1.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2DownTo1.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2DownTo1.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2DownTo1.groovy Wed May 14 14:19:38 2014
@@ -37,8 +37,7 @@ class TestClusterFlex2DownTo1 extends HB
"test_cluster_flex_2_down_to_1",
1, 1,
2,
- 1
- ,
+ 1,
false)
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2To5.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2To5.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2To5.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlex2To5.groovy Wed May 14 14:19:38 2014
@@ -37,8 +37,7 @@ class TestClusterFlex2To5 extends HBaseM
1,
1,
2,
- 5
- ,
+ 5,
true)
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlexDownToZero.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlexDownToZero.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlexDownToZero.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestClusterFlexDownToZero.groovy Wed May 14 14:19:38 2014
@@ -34,10 +34,10 @@ class TestClusterFlexDownToZero extends
public void testClusterFlexDownToZero() throws Throwable {
assert flexHBaseClusterTestRun(
"test_cluster_flex_down_to_zero",
- 1, 1,
1,
- 0
- ,
+ 1,
+ 1,
+ 0,
false)
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestHMasterFlex1To2.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestHMasterFlex1To2.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestHMasterFlex1To2.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/flexing/TestHMasterFlex1To2.groovy Wed May 14 14:19:38 2014
@@ -37,8 +37,7 @@ class TestHMasterFlex1To2 extends HBaseM
1,
2,
1,
- 1
- ,
+ 1,
true)
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy Wed May 14 14:19:38 2014
@@ -50,7 +50,7 @@ class TestFreezeReconfigureThawLiveRegio
String clustername = "test_freeze_reconfigure_thaw_live_regionservice"
int regionServerCount = 4
int nodemanagers = 3
- YarnConfiguration conf = getConfiguration()
+ YarnConfiguration conf = configuration
//one vcore per node
conf.setInt("yarn.nodemanager.resource.cpu-vcores", 1)
createMiniCluster(clustername, conf, nodemanagers, true)
@@ -58,13 +58,13 @@ class TestFreezeReconfigureThawLiveRegio
"Create a $regionServerCount node cluster, freeze it, patch the configuration files," +
" thaw it and verify that it came back with the new settings")
- ServiceLauncher launcher = createHBaseCluster(
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(
clustername,
regionServerCount,
[],
true,
true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
log.info("${status.toJsonString()}")
@@ -93,7 +93,7 @@ class TestFreezeReconfigureThawLiveRegio
sliderFileSystem,
clusterDir)
- def snapshotPath = instanceDefinition.getInternalOperations().get(
+ def snapshotPath = instanceDefinition.internalOperations.get(
OptionKeys.INTERNAL_SNAPSHOT_CONF_PATH)
assert snapshotPath != null
@@ -110,8 +110,8 @@ class TestFreezeReconfigureThawLiveRegio
ConfigHelper.saveConfig(dfs, hbaseSiteXML, originalConf);
//now let's start the cluster up again
- ServiceLauncher launcher2 = thawCluster(clustername, [], true);
- SliderClient thawed = launcher2.service as SliderClient
+ ServiceLauncher<SliderClient> launcher2 = thawCluster(clustername, [], true);
+ SliderClient thawed = launcher2.service
clustat = basicHBaseClusterStartupSequence(thawed)
//get the options
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy Wed May 14 14:19:38 2014
@@ -43,15 +43,15 @@ class TestFreezeThawLiveRegionService ex
public void testFreezeThawLiveRegionService() throws Throwable {
String clustername = "test_freeze_thaw_live_regionservice"
int regionServerCount = 2
- createMiniCluster(clustername, getConfiguration(), 1, true)
+ createMiniCluster(clustername, configuration, 1, true)
describe("Create a cluster, freeze it, thaw it and verify that it came back ")
//use a smaller AM HEAP to include it in the test cycle
ServiceLauncher launcher = createHBaseCluster(clustername, regionServerCount,
- [
- Arguments.ARG_COMP_OPT, SliderKeys.COMPONENT_AM, RoleKeys.JVM_HEAP, "96M",
- ],
- true, true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ [
+ Arguments.ARG_COMP_OPT, SliderKeys.COMPONENT_AM, RoleKeys.JVM_HEAP, "96M",
+ ],
+ true, true)
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
log.info("${status.toJsonString()}")
@@ -66,8 +66,8 @@ class TestFreezeThawLiveRegionService ex
//verify you can't start a new cluster with that name
try {
- ServiceLauncher launcher3 = createHBaseCluster(clustername, regionServerCount, [], false, false)
- SliderClient cluster3 = launcher3.service as SliderClient
+ ServiceLauncher<SliderClient> launcher3 = createHBaseCluster(clustername, regionServerCount, [], false, false)
+ SliderClient cluster3 = launcher3.service
fail("expected a failure, got ${cluster3}")
} catch (SliderException e) {
assert e.exitCode == SliderExitCodes.EXIT_APPLICATION_IN_USE;
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/Test2Master2RS.groovy Wed May 14 14:19:38 2014
@@ -43,13 +43,13 @@ class Test2Master2RS extends HBaseMiniCl
String clustername = "test2master2rs"
int regionServerCount = 2
- createMiniCluster(clustername, getConfiguration(), 1, 1, 1, true, false)
+ createMiniCluster(clustername, configuration, 1, 1, 1, true, false)
describe(" Create a two master, two region service cluster");
//now launch the cluster
int masterCount = 2
- ServiceLauncher launcher = createHBaseCluster(
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(
clustername,
masterCount,
regionServerCount,
@@ -57,7 +57,7 @@ class Test2Master2RS extends HBaseMiniCl
true,
true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
log.info("${status.toJsonString()}")
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy Wed May 14 14:19:38 2014
@@ -45,19 +45,19 @@ class TestHBaseMaster extends HBaseMiniC
@Test
public void testHBaseMaster() throws Throwable {
String clustername = "test_hbase_master"
- createMiniCluster(clustername, getConfiguration(), 1, true)
+ createMiniCluster(clustername, 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 launcher = createHBaseCluster(clustername, regionServerCount,
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount,
[
Arguments.ARG_COMP_OPT, HBaseKeys.ROLE_MASTER, RoleKeys.JVM_HEAP, "256M",
Arguments.ARG_DEFINE, SliderXmlConfKeys.KEY_YARN_QUEUE + "=default"
],
true,
true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
@@ -75,38 +75,4 @@ class TestHBaseMaster extends HBaseMiniC
hbaseClusterStartupToLiveTime)
}
- @Test
- public void testHBaseMasterWithBadHeap() throws Throwable {
- String clustername = "test_hbase_master_with_bad_heap"
- createMiniCluster(clustername, getConfiguration(), 1, true)
-
- describe "verify that bad Java heap options are picked up"
- //now launch the cluster with 1 region server
- int regionServerCount = 1
- try {
- ServiceLauncher launcher = createHBaseCluster(clustername, regionServerCount,
- [Arguments.ARG_COMP_OPT, HBaseKeys.ROLE_WORKER, RoleKeys.JVM_HEAP, "invalid"], true, true)
- SliderClient sliderClient = (SliderClient) launcher.service
- addToTeardown(sliderClient);
-
- AggregateConf launchedInstance = sliderClient.launchedInstanceDefinition
- AggregateConf liveInstance = sliderClient.launchedInstanceDefinition
-
-
-
- basicHBaseClusterStartupSequence(sliderClient)
- def report = waitForClusterLive(sliderClient)
-
- ClusterStatus clustat = getHBaseClusterStatus(sliderClient);
- // verify that region server cannot start
- if (clustat.servers.size()) {
- dumpClusterDescription("original",launchedInstance )
- dumpClusterDescription("live", sliderClient.liveInstanceDefinition)
- dumpClusterStatus(sliderClient,"JVM heap option not picked up")
- }
- assert 0 == clustat.servers.size()
- } catch (ServiceLaunchException e) {
- assertExceptionDetails(e, SliderExitCodes.EXIT_DEPLOYMENT_FAILED)
- }
- }
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterOnHDFS.groovy Wed May 14 14:19:38 2014
@@ -36,11 +36,11 @@ class TestHBaseMasterOnHDFS extends HBas
@Test
public void testHBaseMasteOnHDFS() throws Throwable {
String clustername = "test_hbase_master_on_hdfs"
- createMiniCluster(clustername, getConfiguration(), 1, 1, 1, true, true)
+ createMiniCluster(clustername, configuration, 1, 1, 1, true, true)
log.info("HDFS is at $fsDefaultName")
assert fsDefaultName.startsWith("hdfs://")
- ServiceLauncher launcher = createHBaseCluster(clustername, 1, [], true, true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, 1, [], true, true)
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
log.info("Status $status")
Copied: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterWithBadHeap.groovy (from r1594525, incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy)
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterWithBadHeap.groovy?p2=incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterWithBadHeap.groovy&p1=incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy&r1=1594525&r2=1594585&rev=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMaster.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestHBaseMasterWithBadHeap.groovy Wed May 14 14:19:38 2014
@@ -21,18 +21,18 @@ package org.apache.slider.providers.hbas
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.hadoop.hbase.ClusterStatus
-import org.apache.slider.common.SliderExitCodes
-import org.apache.slider.common.SliderXmlConfKeys
import org.apache.slider.api.ClusterDescription
import org.apache.slider.api.RoleKeys
-import org.apache.slider.core.conf.AggregateConf
-import org.apache.slider.providers.hbase.HBaseKeys
-import org.apache.slider.core.registry.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.common.SliderExitCodes
+import org.apache.slider.common.SliderXmlConfKeys
+import org.apache.slider.common.params.Arguments
+import org.apache.slider.core.conf.AggregateConf
import org.apache.slider.core.main.ServiceLaunchException
import org.apache.slider.core.main.ServiceLauncher
+import org.apache.slider.core.registry.zk.ZKIntegration
+import org.apache.slider.providers.hbase.HBaseKeys
+import org.apache.slider.providers.hbase.minicluster.HBaseMiniClusterTestBase
import org.junit.Test
/**
@@ -40,45 +40,13 @@ import org.junit.Test
*/
@CompileStatic
@Slf4j
-class TestHBaseMaster extends HBaseMiniClusterTestBase {
+class TestHBaseMasterWithBadHeap extends HBaseMiniClusterTestBase {
- @Test
- public void testHBaseMaster() throws Throwable {
- String clustername = "test_hbase_master"
- createMiniCluster(clustername, getConfiguration(), 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 launcher = createHBaseCluster(clustername, regionServerCount,
- [
- Arguments.ARG_COMP_OPT, HBaseKeys.ROLE_MASTER, RoleKeys.JVM_HEAP, "256M",
- Arguments.ARG_DEFINE, SliderXmlConfKeys.KEY_YARN_QUEUE + "=default"
- ],
- true,
- true)
- SliderClient sliderClient = (SliderClient) launcher.service
- addToTeardown(sliderClient);
- ClusterDescription status = sliderClient.getClusterDescription(clustername)
-
- //dumpFullHBaseConf(sliderClient, clustername)
-
- basicHBaseClusterStartupSequence(sliderClient)
-
- //verify the #of region servers is as expected
- dumpClusterStatus(sliderClient, "post-hbase-boot status")
-
- //get the hbase status
- waitForHBaseRegionServerCount(sliderClient, clustername, 1, hbaseClusterStartupToLiveTime)
- waitForWorkerInstanceCount(sliderClient, 1, hbaseClusterStartupToLiveTime)
- waitForRoleCount(sliderClient, HBaseKeys.ROLE_MASTER, 1,
- hbaseClusterStartupToLiveTime)
- }
@Test
public void testHBaseMasterWithBadHeap() throws Throwable {
String clustername = "test_hbase_master_with_bad_heap"
- createMiniCluster(clustername, getConfiguration(), 1, true)
+ createMiniCluster(clustername, configuration, 1, true)
describe "verify that bad Java heap options are picked up"
//now launch the cluster with 1 region server
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestLiveRegionServiceOnHDFS.groovy Wed May 14 14:19:38 2014
@@ -39,14 +39,14 @@ class TestLiveRegionServiceOnHDFS extend
public void testLiveRegionServiceOnHDFS() throws Throwable {
String clustername = "test_live_region_service_on_hdfs"
int regionServerCount = 1
- createMiniCluster(clustername, getConfiguration(), 1, 1, 1, true, true)
+ createMiniCluster(clustername, 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 launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
- SliderClient sliderClient = (SliderClient) launcher.service
+ ServiceLauncher<SliderClient> launcher = createHBaseCluster(clustername, regionServerCount, [], true, true)
+ SliderClient sliderClient = launcher.service
addToTeardown(sliderClient);
ClusterDescription status = sliderClient.getClusterDescription(clustername)
log.info("${status.toJsonString()}")
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/live/TestTwoLiveClusters.groovy Wed May 14 14:19:38 2014
@@ -26,7 +26,6 @@ import org.apache.slider.providers.hbase
import org.apache.slider.core.main.ServiceLauncher
import org.apache.slider.core.registry.info.ServiceInstanceData
import org.apache.slider.server.services.curator.CuratorServiceInstance
-import org.apache.slider.server.services.curator.RegistryBinderService
import org.apache.slider.server.services.registry.SliderRegistryService
import org.junit.Test
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestSliderConfDirToMasterlessAM.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestSliderConfDirToMasterlessAM.groovy?rev=1594585&r1=1594584&r2=1594585&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestSliderConfDirToMasterlessAM.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/masterless/TestSliderConfDirToMasterlessAM.groovy Wed May 14 14:19:38 2014
@@ -84,9 +84,6 @@ class TestSliderConfDirToMasterlessAM ex
SliderUtils.deleteDirectoryTree(localConf)
}
-
-
}
-
}