SLIDER-94 testing related -constants in accumulo tests weren't being set up properly, but groovy was hiding this
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1ede5ff9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1ede5ff9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1ede5ff9 Branch: refs/heads/develop Commit: 1ede5ff91f89060fc241c22f9ac3d2f344a869be Parents: 7e507e4 Author: Steve Loughran <ste...@apache.org> Authored: Tue Jun 3 16:18:48 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Jun 3 16:18:48 2014 +0100 ---------------------------------------------------------------------- .../accumulo/AccumuloProviderService.java | 1 - .../providers/accumulo/AccumuloTestBase.groovy | 98 ++++++++++++-------- .../live/TestAccCorrectInstanceName.groovy | 2 +- .../accumulo/live/TestAccFreezeThaw.groovy | 4 +- .../accumulo/live/TestAccLiveHDFSArchive.groovy | 2 +- .../live/TestAccLiveLocalArchive.groovy | 2 +- .../accumulo/live/TestAccM1T1GC1Mon1.groovy | 2 +- .../accumulo/live/TestAccM2T2GC1Mon1.groovy | 2 +- .../accumulo/live/TestAccumuloAMWebApp.groovy | 2 +- 9 files changed, 66 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java b/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java index df927a9..4f5f2fa 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java +++ b/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java @@ -49,7 +49,6 @@ import org.apache.slider.common.tools.SliderFileSystem; import org.apache.slider.common.tools.SliderUtils; import org.apache.slider.core.zk.BlockingZKWatcher; import org.apache.slider.common.tools.ConfigHelper; -import org.apache.slider.server.services.utility.WorkflowEventNotifyingService; import org.apache.slider.server.services.workflow.ForkedProcessService; import org.apache.slider.server.services.workflow.WorkflowCallbackService; import org.apache.zookeeper.KeeperException; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy index 53ac7f5..1e2e27f 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy +++ b/slider-providers/accumulo/slider-accumulo-provider/src/test/groovy/org/apache/slider/providers/accumulo/AccumuloTestBase.groovy @@ -40,23 +40,18 @@ import static org.apache.slider.common.params.Arguments.ARG_RES_COMP_OPT @Slf4j public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { - public static final int ACCUMULO_LAUNCH_WAIT_TIME - public static final boolean ACCUMULO_TESTS_ENABLED - - public static final int ACCUMULO_CLUSTER_STARTUP_TIME = ACCUMULO_LAUNCH_WAIT_TIME - public static final int ACCUMULO_CLUSTER_STOP_TIME = 1 * 60 * 1000 + public final int accumulo_cluster_startup_time = accumuloLaunchWaitTime /** * The time to sleep before trying to talk to the HBase Master and * expect meaningful results. */ - public static final int ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME = ACCUMULO_CLUSTER_STARTUP_TIME + public final int accumulo_cluster_startup_to_live_time = accumulo_cluster_startup_time public static final int ACCUMULO_GO_LIVE_TIME = 60000 - @Override public String getTestConfigurationPath() { - return "src/main/resources/" + CONF_RESOURCE; + return "src/main/resources/" + CONF_RESOURCE; } @Override @@ -79,7 +74,7 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { killAllAccumuloProcesses(); } } - + void killAllAccumuloProcesses() { killJavaProcesses("org.apache.accumulo.start.Main", SIGKILL) } @@ -103,7 +98,7 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { * path is valid -that is expected to be a failure on tests that require * HBase home to be set. */ - + public void assumeOtherSettings(YarnConfiguration conf) { assumeStringOptionSet(conf, OPTION_ZK_HOME) } @@ -118,13 +113,23 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { * @param blockUntilRunning block until the AM is running * @return launcher which will have executed the command. */ - public ServiceLauncher<SliderClient> createAccCluster(String clustername, int tablets, List<String> extraArgs, boolean deleteExistingData, boolean blockUntilRunning) { + public ServiceLauncher<SliderClient> createAccCluster( + String clustername, + int tablets, + List<String> extraArgs, + boolean deleteExistingData, + boolean blockUntilRunning) { Map<String, Integer> roles = [ (ROLE_MASTER): 1, (ROLE_TABLET): tablets, ]; - return createAccCluster(clustername, roles, extraArgs, deleteExistingData, blockUntilRunning); -} + return createAccCluster( + clustername, + roles, + extraArgs, + deleteExistingData, + blockUntilRunning); + } /** * Create an accumulo cluster @@ -135,30 +140,43 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { * @param blockUntilRunning * @return the cluster launcher */ - public ServiceLauncher<SliderClient> createAccCluster(String clustername, Map<String, Integer> roles, List<String> extraArgs, boolean deleteExistingData, boolean blockUntilRunning) { + public ServiceLauncher<SliderClient> createAccCluster( + String clustername, + Map<String, Integer> roles, + List<String> extraArgs, + boolean deleteExistingData, + boolean blockUntilRunning) { extraArgs << ARG_PROVIDER << PROVIDER_ACCUMULO; YarnConfiguration conf = testConfiguration def clusterOps = [ - (OPTION_ZK_HOME): conf.getTrimmed(OPTION_ZK_HOME), - (OPTION_HADOOP_HOME): conf.getTrimmed(OPTION_HADOOP_HOME), - ("site." + AccumuloConfigFileOptions.MONITOR_PORT_CLIENT): AccumuloConfigFileOptions.MONITOR_PORT_CLIENT_DEFAULT, - ("site." + AccumuloConfigFileOptions.MASTER_PORT_CLIENT): AccumuloConfigFileOptions.MASTER_PORT_CLIENT_DEFAULT, + (OPTION_ZK_HOME) : conf.getTrimmed( + OPTION_ZK_HOME), + (OPTION_HADOOP_HOME) : conf.getTrimmed( + OPTION_HADOOP_HOME), + ("site." + + AccumuloConfigFileOptions.MONITOR_PORT_CLIENT) : AccumuloConfigFileOptions.MONITOR_PORT_CLIENT_DEFAULT, + ("site." + + AccumuloConfigFileOptions.MASTER_PORT_CLIENT) : AccumuloConfigFileOptions.MASTER_PORT_CLIENT_DEFAULT, ] - extraArgs << ARG_RES_COMP_OPT << ROLE_MASTER << ResourceKeys.YARN_MEMORY << YRAM; - extraArgs << ARG_RES_COMP_OPT << ROLE_TABLET << ResourceKeys.YARN_MEMORY << YRAM - extraArgs << ARG_RES_COMP_OPT << ROLE_MONITOR << ResourceKeys.YARN_MEMORY << YRAM - extraArgs << ARG_RES_COMP_OPT << ROLE_GARBAGE_COLLECTOR << ResourceKeys.YARN_MEMORY << YRAM + extraArgs << ARG_RES_COMP_OPT << ROLE_MASTER << ResourceKeys.YARN_MEMORY << + YRAM; + extraArgs << ARG_RES_COMP_OPT << ROLE_TABLET << ResourceKeys.YARN_MEMORY << + YRAM + extraArgs << ARG_RES_COMP_OPT << ROLE_MONITOR << ResourceKeys.YARN_MEMORY << + YRAM + extraArgs << ARG_RES_COMP_OPT << ROLE_GARBAGE_COLLECTOR << + ResourceKeys.YARN_MEMORY << YRAM return createCluster(clustername, - roles, - extraArgs, - deleteExistingData, - blockUntilRunning, - clusterOps) + roles, + extraArgs, + deleteExistingData, + blockUntilRunning, + clusterOps) } def getAccClusterStatus() { @@ -166,11 +184,11 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { instance.getConnector("user", "pass").instanceOperations().tabletServers; } - + public String fetchLocalPage(int port, String page) { - String url = "http://localhost:" + port+ page + String url = "http://localhost:" + port + page return fetchWebPage(url) - + } public ClusterDescription flexAccClusterTestRun( @@ -178,22 +196,22 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { int planCount = plan.size() assert planCount > 0 createMiniCluster(clustername, getConfiguration(), - 1, - true); + 1, + true); //now launch the cluster SliderClient sliderClient = null; ServiceLauncher launcher = createAccCluster(clustername, - plan[0], - [], - true, - true); + plan[0], + [], + true, + true); sliderClient = (SliderClient) launcher.service; try { //verify the #of roles is as expected //get the hbase status waitForRoleCount(sliderClient, plan[0], - ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME); + accumulo_cluster_startup_to_live_time); sleep(ACCUMULO_GO_LIVE_TIME); plan.remove(0) @@ -209,12 +227,12 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { flexTarget ); cd = waitForRoleCount(sliderClient, flexTarget, - ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME); + accumulo_cluster_startup_to_live_time); sleep(ACCUMULO_GO_LIVE_TIME); } - + return cd; } finally { @@ -222,5 +240,5 @@ public abstract class AccumuloTestBase extends YarnZKMiniClusterTestBase { } } - + } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/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 89dc90c..348ccd4 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 @@ -65,7 +65,7 @@ class TestAccCorrectInstanceName extends AccumuloTestBase { waitWhileClusterLive(sliderClient); assert sliderClient.applicationReport.yarnApplicationState == YarnApplicationState.RUNNING - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME) + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time) describe("Cluster status") ClusterDescription status status = sliderClient.getClusterDescription(clustername) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/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 3983a5d..143974f 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 @@ -56,7 +56,7 @@ class TestAccFreezeThaw extends AccumuloTestBase { addToTeardown(sliderClient); - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME) + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time) //now give the cluster a bit of time to actually start work log.info("Sleeping for a while") @@ -93,7 +93,7 @@ class TestAccFreezeThaw extends AccumuloTestBase { ServiceLauncher launcher2 = thawCluster(clustername, [], true); SliderClient sliderClient2 = (SliderClient) launcher2.service addToTeardown(sliderClient2) - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME, "thawing") + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time, "thawing") sleepForAccumuloClusterLive(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/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 2220cdc..2f744bb 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 @@ -61,7 +61,7 @@ class TestAccLiveHDFSArchive extends AccumuloTestBase { waitWhileClusterLive(sliderClient); assert sliderClient.applicationReport.yarnApplicationState == YarnApplicationState.RUNNING - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME) + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time) describe("Cluster status") ClusterDescription status status = sliderClient.getClusterDescription(clustername) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/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 1e3adbd..98b8b44 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 @@ -63,7 +63,7 @@ class TestAccLiveLocalArchive extends AccumuloTestBase { waitWhileClusterLive(sliderClient); assert sliderClient.applicationReport.yarnApplicationState == YarnApplicationState.RUNNING - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME) + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time) describe("Cluster status") ClusterDescription status status = sliderClient.getClusterDescription(clustername) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/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 9d2cee6..7074294 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 @@ -59,7 +59,7 @@ class TestAccM1T1GC1Mon1 extends AccumuloTestBase { waitWhileClusterLive(sliderClient); assert sliderClient.applicationReport.yarnApplicationState == YarnApplicationState.RUNNING - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME) + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time) describe("Cluster status") ClusterDescription status status = sliderClient.getClusterDescription(clustername) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/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 2494a56..253192b 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 @@ -61,7 +61,7 @@ class TestAccM2T2GC1Mon1 extends AccumuloTestBase { waitWhileClusterLive(sliderClient); assert sliderClient.applicationReport.yarnApplicationState == YarnApplicationState.RUNNING - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME) + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time) describe("Cluster status") ClusterDescription status status = sliderClient.getClusterDescription(clustername) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1ede5ff9/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 bd975e4..df40df7 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 @@ -62,7 +62,7 @@ class TestAccumuloAMWebApp extends AccumuloTestBase { waitWhileClusterLive(sliderClient); assert sliderClient.applicationReport.yarnApplicationState == YarnApplicationState.RUNNING - waitForRoleCount(sliderClient, roles, ACCUMULO_CLUSTER_STARTUP_TO_LIVE_TIME) + waitForRoleCount(sliderClient, roles, accumulo_cluster_startup_to_live_time) describe("Cluster status") ClusterDescription status status = sliderClient.getClusterDescription(clustername)