SLIDER-326 regression: integration tests failing in/after freeze
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b8c27622 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b8c27622 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b8c27622 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: b8c27622820a688e02c197f66b5e3725c4f18919 Parents: 15da279 Author: Steve Loughran <ste...@apache.org> Authored: Fri Aug 15 13:46:35 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Aug 15 13:46:35 2014 +0100 ---------------------------------------------------------------------- .../slider/funtest/framework/CommandTestBase.groovy | 16 +++++++++++++++- .../lifecycle/AgentClusterLifecycleIT.groovy | 11 ++++++++--- .../hbase/funtest/HBaseClusterLifecycleIT.groovy | 16 ++++++++++++---- .../hbase/funtest/HBaseIntegrationIT.groovy | 5 ++++- .../providers/hbase/funtest/HBaseLoadIT.groovy | 7 +++++++ src/test/clusters/sandbox/slider/slider-client.xml | 2 +- 6 files changed, 47 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b8c27622/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 ba7be53..278bd2b 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 @@ -211,6 +211,20 @@ abstract class CommandTestBase extends SliderTestUtils { ]) } + + static SliderShell freeze( + int exitCode, + String name, + Collection<String> args) { + slider(exitCode, [ACTION_FREEZE, name] + args) + } + + /** + * Freeze cluster: no exit code checking + * @param name + * @param args + * @return + */ static SliderShell freeze(String name, Collection<String> args) { slider([ACTION_FREEZE, name] + args) } @@ -288,7 +302,7 @@ abstract class CommandTestBase extends SliderTestUtils { } static SliderShell thaw(String name, Collection<String> args) { - slider([ACTION_THAW, name] + args) + slider(0, [ACTION_THAW, name] + args) } static SliderShell registry(int result, Collection<String> commands) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b8c27622/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy index b30d670..6b0f2bd 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy @@ -126,7 +126,7 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase log.info("Connected via Client {}", sliderClient.toString()) //freeze - freeze(CLUSTER, [ + freeze(0, CLUSTER, [ ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), ARG_MESSAGE, "freeze-in-test-cluster-lifecycle" ]) @@ -145,7 +145,7 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase exists(0, CLUSTER) describe " >>> Cluster is now thawed." - freeze(CLUSTER, + freeze(0, CLUSTER, [ ARG_FORCE, ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), @@ -178,7 +178,12 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase StatusKeys.INFO_CONTAINERS_AM_RESTART) assert restarted != null assert Integer.parseInt(restarted) == 0 - freeze(CLUSTER) + freeze(0, CLUSTER, + [ + ARG_FORCE, + ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), + ARG_MESSAGE, "final-shutdown" + ]) destroy(0, CLUSTER) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b8c27622/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterLifecycleIT.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterLifecycleIT.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterLifecycleIT.groovy index aca12ef..63b5fb6 100644 --- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterLifecycleIT.groovy +++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseClusterLifecycleIT.groovy @@ -118,11 +118,13 @@ public class HBaseClusterLifecycleIT extends HBaseCommandTestBase log.info("Connected via Client {}", sliderClient.toString()) //freeze - freeze(CLUSTER, [ + def frozen = freeze(0, CLUSTER, [ ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), - ARG_MESSAGE, "freeze-in-test cluster lifecycle" + ARG_MESSAGE, "freeze-in-test-cluster-lifecycle" ]) + frozen.assertExitCode(0) +// sleep(FREEZE_WAIT_TIME) //cluster exists if you don't want it to be live exists(0, CLUSTER, false) // condition returns false if it is required to be live @@ -136,7 +138,7 @@ public class HBaseClusterLifecycleIT extends HBaseCommandTestBase ARG_WAIT, Integer.toString(THAW_WAIT_TIME), ]) exists(0, CLUSTER) - freeze(CLUSTER, + freeze(0, CLUSTER, [ ARG_FORCE, ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), @@ -165,7 +167,13 @@ public class HBaseClusterLifecycleIT extends HBaseCommandTestBase StatusKeys.INFO_CONTAINERS_AM_RESTART) assert restarted != null assert Integer.parseInt(restarted) == 0 - freeze(CLUSTER) + freeze(0, CLUSTER, + [ + ARG_FORCE, + ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), + ARG_MESSAGE, "teardown-freeze" + ]) + destroy(0, CLUSTER) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b8c27622/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseIntegrationIT.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseIntegrationIT.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseIntegrationIT.groovy index 69da02a..21a7494 100644 --- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseIntegrationIT.groovy +++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseIntegrationIT.groovy @@ -24,13 +24,16 @@ import org.apache.hadoop.hbase.IntegrationTestingUtility import org.apache.hadoop.util.ToolRunner import org.apache.slider.api.ClusterDescription import org.apache.slider.client.SliderClient -import org.apache.slider.providers.hbase.HBaseConfigFileOptions; +import org.apache.slider.providers.hbase.HBaseConfigFileOptions +import org.junit.Ignore; /* Runs IntegrationTestIngest on cluster * * Note: this test runs for about 20 minutes * please set slider.test.timeout.seconds accordingly */ + +@Ignore("appears localhost only") class HBaseIntegrationIT extends FunctionalHBaseClusterIT { @Override http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b8c27622/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseLoadIT.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseLoadIT.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseLoadIT.groovy index 7393186..61bcc70 100644 --- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseLoadIT.groovy +++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseLoadIT.groovy @@ -23,6 +23,8 @@ import org.apache.hadoop.hbase.util.LoadTestTool import org.apache.slider.api.ClusterDescription import org.apache.slider.client.SliderClient import org.apache.slider.providers.hbase.HBaseConfigFileOptions +import org.junit.Assume +import org.junit.Ignore class HBaseLoadIT extends FunctionalHBaseClusterIT { @@ -32,6 +34,11 @@ class HBaseLoadIT extends FunctionalHBaseClusterIT { } @Override + void testHBaseCreateCluster() throws Throwable { + super.testHBaseCreateCluster() + } + + @Override void clusterOperations( String clustername, SliderClient sliderClient, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b8c27622/src/test/clusters/sandbox/slider/slider-client.xml ---------------------------------------------------------------------- diff --git a/src/test/clusters/sandbox/slider/slider-client.xml b/src/test/clusters/sandbox/slider/slider-client.xml index 30937ec..5ac5d59 100644 --- a/src/test/clusters/sandbox/slider/slider-client.xml +++ b/src/test/clusters/sandbox/slider/slider-client.xml @@ -52,7 +52,7 @@ <property> <name>slider.test.agent.enabled</name> <description>Flag to enable/disable Agent tests</description> - <value>false</value> + <value>true</value> </property>
