Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER_187_start_stop 7bac2e664 -> 266df5c12
SLIDER-187. Use start/stop instead of freeze/thaw Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/266df5c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/266df5c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/266df5c1 Branch: refs/heads/feature/SLIDER_187_start_stop Commit: 266df5c121ff7c85ac17b4f3ce52c98c4fe38701 Parents: 7bac2e6 Author: Sumit Mohanty <[email protected]> Authored: Fri Aug 29 17:39:20 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Aug 29 17:39:20 2014 -0700 ---------------------------------------------------------------------- README.md | 4 ++-- slider-assembly/src/main/bash/README.md | 2 +- slider-assembly/src/main/bash/slider_destroy | 4 ++-- .../org/apache/slider/client/SliderClient.java | 10 +++++----- .../slider/common/params/ActionFreezeArgs.java | 2 +- .../common/params/LaunchArgsAccessor.java | 2 +- .../slider/common/params/SliderActions.java | 8 ++++---- .../server/appmaster/state/NodeEntry.java | 2 +- .../server/appmaster/state/RoleHistory.java | 6 +++--- .../agent/actions/TestActionExists.groovy | 2 +- .../agent/freezethaw/TestFreezeCommands.groovy | 10 +++++----- .../TestFreezeThawMasterlessAM.groovy | 8 ++++---- .../freezethaw/TestFreezeUnknownCluster.groovy | 2 +- .../standalone/TestBuildStandaloneAM.groovy | 2 +- .../standalone/TestStandaloneAMDestroy.groovy | 6 +++--- .../standalone/TestStandaloneRegistryAM.groovy | 2 +- .../slider/client/TestCommonArgParsing.groovy | 2 +- .../model/history/TestRoleHistoryRW.groovy | 4 ++-- .../slider/test/YarnMiniClusterTestBase.groovy | 6 +++--- .../src/test/resources/example-slider-test.xml | 4 ++-- .../funtest/framework/CommandTestBase.groovy | 2 +- .../lifecycle/AgentClusterLifecycleIT.groovy | 8 ++++---- .../src/test/manual/python/SliderTester.py | 4 ++-- .../accumulo/live/TestAccFreezeThaw.groovy | 4 ++-- .../funtest/HBaseClusterLifecycleIT.groovy | 8 ++++---- .../TestFreezeThawClusterFromArchive.groovy | 2 +- .../build/TestBuildThawClusterM1W1.groovy | 2 +- ...reezeReconfigureThawLiveRegionService.groovy | 4 ++-- .../TestFreezeThawLiveRegionService.groovy | 4 ++-- .../minicluster/live/TestTwoLiveClusters.groovy | 4 ++-- src/test/clusters/sandbox/operations.md | 20 ++++++++++---------- src/test/clusters/ubuntu-secure/operations.md | 14 +++++++------- 32 files changed, 82 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index b91e477..a25b83a 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ Slider is a YARN application to deploy existing distributed applications on YARN monitor them and make them larger or smaller as desired -even while the cluster is running. -Clusters can be stopped, "frozen" and restarted, "thawed" later; the distribution +Clusters can be stopped and restarted later; the distribution of the deployed application across the YARN cluster is persisted -enabling -a best-effort placement close to the previous locations on a cluster thaw. +a best-effort placement close to the previous locations on a cluster start. Applications which remember the previous placement of data (such as HBase) can exhibit fast start-up times from this feature. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-assembly/src/main/bash/README.md ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/bash/README.md b/slider-assembly/src/main/bash/README.md index a4b7b08..d818aeb 100644 --- a/slider-assembly/src/main/bash/README.md +++ b/slider-assembly/src/main/bash/README.md @@ -79,7 +79,7 @@ Tear Down --------- * slider_destroy will do the following - 1. Freeze the slider application based on provided name + 1. Stop the slider application based on provided name 2. Destory the slider application based on provided name * The following args are required http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-assembly/src/main/bash/slider_destroy ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/bash/slider_destroy b/slider-assembly/src/main/bash/slider_destroy index 9039751..7ca30b7 100755 --- a/slider-assembly/src/main/bash/slider_destroy +++ b/slider-assembly/src/main/bash/slider_destroy @@ -53,8 +53,8 @@ source $config # # Main # -echo -e "\n## Freezing app $app_name" -sudo -u yarn $SLIDER_INST_DIR/bin/slider freeze $app_name --manager $RM_ADDRESS || exit 1 +echo -e "\n## Stopping app $app_name" +sudo -u yarn $SLIDER_INST_DIR/bin/slider stop $app_name --manager $RM_ADDRESS || exit 1 echo "SUCCESS" echo -e "\n## Destroying app $app_name" http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 77cd244..f0da136 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -1746,10 +1746,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe } /** - * Freeze the cluster + * Stop the cluster * * @param clustername cluster name - * @param freezeArgs arguments to the freeze + * @param freezeArgs arguments to the stop * @return EXIT_SUCCESS if the cluster was not running by the end of the operation */ public int actionFreeze(String clustername, @@ -1772,10 +1772,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe if (app == null) { // exit early log.info("Cluster {} not running", clustername); - // not an error to freeze a frozen cluster + // not an error to stop a stopped cluster return EXIT_SUCCESS; } - log.debug("App to freeze was found: {}:\n{}", clustername, + log.debug("App to stop was found: {}:\n{}", clustername, new SliderUtils.OnDemandReportStringifier(app)); if (app.getYarnApplicationState().ordinal() >= YarnApplicationState.FINISHED.ordinal()) { @@ -1789,7 +1789,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe if (forcekill) { //escalating to forced kill - application.kill("Forced freeze of " + clustername + + application.kill("Forced stop of " + clustername + ": " + text); } else { try { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java index 04f6305..e3085d9 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionFreezeArgs.java @@ -32,7 +32,7 @@ public class ActionFreezeArgs extends AbstractActionArgs implements return SliderActions.ACTION_FREEZE; } - public static final String FREEZE_COMMAND_ISSUED = "freeze command issued"; + public static final String FREEZE_COMMAND_ISSUED = "stop command issued"; @ParametersDelegate public WaitArgsDelegate waitDelegate = new WaitArgsDelegate(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/main/java/org/apache/slider/common/params/LaunchArgsAccessor.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/LaunchArgsAccessor.java b/slider-core/src/main/java/org/apache/slider/common/params/LaunchArgsAccessor.java index f4ff4ce..c36a968 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/LaunchArgsAccessor.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/LaunchArgsAccessor.java @@ -19,7 +19,7 @@ package org.apache.slider.common.params; /** - * Launch args for create and thaw and anything else that can start something + * Launch args for create and start and anything else that can start something */ public interface LaunchArgsAccessor extends WaitTimeAccessor { String getRmAddress(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java index 8e50a83..ba2bca9 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java @@ -32,7 +32,7 @@ public interface SliderActions { String ACTION_ECHO = "echo"; String ACTION_EXISTS = "exists"; String ACTION_FLEX = "flex"; - String ACTION_FREEZE = "freeze"; + String ACTION_FREEZE = "stop"; String ACTION_GETCONF = "getconf"; String ACTION_HELP = "help"; String ACTION_KILL_CONTAINER = "kill-container"; @@ -41,7 +41,7 @@ public interface SliderActions { String ACTION_RECONFIGURE = "reconfigure"; String ACTION_REGISTRY = "registry"; String ACTION_STATUS = "status"; - String ACTION_THAW = "thaw"; + String ACTION_THAW = "start"; String ACTION_USAGE = "usage"; String ACTION_VERSION = "version"; String DESCRIBE_ACTION_AM_SUICIDE = @@ -58,7 +58,7 @@ public interface SliderActions { "Probe for an application running"; String DESCRIBE_ACTION_FLEX = "Flex a Slider application"; String DESCRIBE_ACTION_FREEZE = - "Freeze/suspend a running application"; + "Stop a running application"; String DESCRIBE_ACTION_GETCONF = "Get the configuration of an application"; String DESCRIBE_ACTION_KILL_CONTAINER = @@ -73,7 +73,7 @@ public interface SliderActions { String DESCRIBE_ACTION_STATUS = "Get the status of an application"; String DESCRIBE_ACTION_THAW = - "Thaw a frozen application"; + "Start a stopped application"; String DESCRIBE_ACTION_VERSION = "Print the Slider version information"; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java index c8ab2a7..83c590b 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeEntry.java @@ -23,7 +23,7 @@ package org.apache.slider.server.appmaster.state; * No fields are synchronized; sync on the instance to work with it * The two fields `releasing` and `requested` are used to track the ongoing - state of YARN requests; they do not need to be persisted across freeze/thaw + state of YARN requests; they do not need to be persisted across stop/start cycles. They may be relevant across AM restart, but without other data structures in the AM, not enough to track what the AM was up to before it was restarted. The strategy will be to ignore unexpected allocation http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java index edcf7ea..e82162f 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java @@ -354,7 +354,7 @@ public class RoleHistory { } /** - * Handle the thaw process <i>after the history has been rebuilt</i>, + * Handle the start process <i>after the history has been rebuilt</i>, * and after any gc/purge */ @VisibleForTesting @@ -381,7 +381,7 @@ public class RoleHistory { e); } - //thaw is then completed + //start is then completed buildAvailableNodeLists(); } else { //fallback to bootstrap procedure @@ -392,7 +392,7 @@ public class RoleHistory { /** - * (After the thaw), rebuild the availability datastructures + * (After the start), rebuild the availability data structures */ @VisibleForTesting public synchronized void buildAvailableNodeLists() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy index 9bfeb8c..a190b7d 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy @@ -110,7 +110,7 @@ class TestActionExists extends AgentMiniClusterTestBase { assert 0 == sliderClient.actionExists(clustername, true) - // freeze the cluster + // stop the cluster clusterActionFreeze(sliderClient, clustername) //verify that exists(live) is now false http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeCommands.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeCommands.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeCommands.groovy index f5eff25..60ffa3e 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeCommands.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeCommands.groovy @@ -45,7 +45,7 @@ class TestFreezeCommands extends AgentMiniClusterTestBase { YarnConfiguration conf = configuration String clustername = createMiniCluster("", conf, 1, 1, 1, true, false) - describe "create a masterless AM, freeze it, try to freeze again" + describe "create a masterless AM, stop it, try to stop again" ServiceLauncher<SliderClient> launcher = createStandaloneAM( clustername @@ -59,7 +59,7 @@ class TestFreezeCommands extends AgentMiniClusterTestBase { assertSucceeded(execSliderCommand(conf, [SliderActions.ACTION_LIST, clustername])) - log.info("First Freeze command"); + log.info("First stop command"); ServiceLauncher freezeCommand = execSliderCommand(conf, [ SliderActions.ACTION_FREEZE, clustername, @@ -67,7 +67,7 @@ class TestFreezeCommands extends AgentMiniClusterTestBase { ]); assertSucceeded(freezeCommand) - log.info("Second Freeze command"); + log.info("Second stop command"); ServiceLauncher<SliderClient> freeze2 = execSliderCommand(conf, [ @@ -94,7 +94,7 @@ class TestFreezeCommands extends AgentMiniClusterTestBase { assert e.exitCode == LauncherExitCodes.EXIT_FALSE; } - log.info("First Thaw"); + log.info("First Start"); def commands = [ @@ -111,7 +111,7 @@ class TestFreezeCommands extends AgentMiniClusterTestBase { assertSucceeded(execSliderCommand(conf, [SliderActions.ACTION_EXISTS, clustername])) - log.info("Freeze 3"); + log.info("stop 3"); ServiceLauncher<SliderClient> freeze3 = execSliderCommand(conf, [ http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeThawMasterlessAM.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeThawMasterlessAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeThawMasterlessAM.groovy index 04be7c0..5a1acef 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeThawMasterlessAM.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeThawMasterlessAM.groovy @@ -31,7 +31,7 @@ import org.apache.slider.core.main.ServiceLauncher import org.junit.Test /** - * freeze and thaw an AM + * stop and start an AM */ @CompileStatic @Slf4j @@ -52,7 +52,7 @@ class TestFreezeThawMasterlessAM extends AgentMiniClusterTestBase { YarnConfiguration conf = configuration String clustername = createMiniCluster("", conf, 1, 1, 1, true, false) - describe "create a masterless AM, freeze it, thaw it" + describe "create a masterless AM, stop it, start it" //copy the confdir somewhere Path resConfPath = new Path(resourceConfDirURI) Path tempConfPath = new Path(confDir) @@ -81,10 +81,10 @@ class TestFreezeThawMasterlessAM extends AgentMiniClusterTestBase { // ApplicationReport report = waitForClusterLive(newCluster) newCluster.getClusterDescription(clustername); - //freeze + //stop assert 0 == clusterActionFreeze(sliderClient, clustername) - //freeze again + //stop again assert 0 == clusterActionFreeze(sliderClient, clustername) } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeUnknownCluster.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeUnknownCluster.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeUnknownCluster.groovy index b81bc77..a7bab01 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeUnknownCluster.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/freezethaw/TestFreezeUnknownCluster.groovy @@ -42,7 +42,7 @@ class TestFreezeUnknownCluster extends AgentMiniClusterTestBase { YarnConfiguration conf = configuration String clustername = createMiniCluster("", conf, 1, true) - describe "try to freeze a cluster that isn't defined" + describe "try to stop a cluster that isn't defined" try { ServiceLauncher<SliderClient> command = execSliderCommand(conf, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestBuildStandaloneAM.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestBuildStandaloneAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestBuildStandaloneAM.groovy index 0665a9a..2058caf 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestBuildStandaloneAM.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestBuildStandaloneAM.groovy @@ -96,7 +96,7 @@ class TestBuildStandaloneAM extends AgentMiniClusterTestBase { - //thaw time + //start time ServiceLauncher<SliderClient> l2 = thawCluster(clustername, [], true) SliderClient thawed = l2.service addToTeardown(thawed); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy index 17e4ff2..aec4930 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy @@ -102,8 +102,8 @@ class TestStandaloneAMDestroy extends AgentMiniClusterTestBase { describe "post destroy checks" sliderFileSystem.verifyDirectoryNonexistent(instanceDir) - describe "thaw expected to fail" - //expect thaw to now fail + describe "start expected to fail" + //expect start to now fail def ex = launchExpectingException(SliderClient, configuration, "", @@ -115,7 +115,7 @@ class TestStandaloneAMDestroy extends AgentMiniClusterTestBase { ]) assert ex instanceof UnknownApplicationInstanceException - describe "thaw completed, checking dir is still absent" + describe "start completed, checking dir is still absent" sliderFileSystem.verifyDirectoryNonexistent(instanceDir) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy index b8a590e..cbbd030 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneRegistryAM.groovy @@ -342,7 +342,7 @@ class TestStandaloneRegistryAM extends AgentMiniClusterTestBase { registryArgs.getConf = unknownFilename assert SliderExitCodes.EXIT_NOT_FOUND == client.actionRegistry(registryArgs) - describe "freeze cluster" + describe "stop cluster" //now kill that cluster assert 0 == clusterActionFreeze(client, clustername) //list it & See if it is still there http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy b/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy index d94cd54..ea44489 100644 --- a/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/client/TestCommonArgParsing.groovy @@ -154,7 +154,7 @@ class TestCommonArgParsing implements SliderActions, Arguments { } /** - * Test a thaw command + * Test a start command * @throws Throwable */ @Test http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryRW.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryRW.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryRW.groovy index 4242ba1..5575076 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryRW.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryRW.groovy @@ -117,9 +117,9 @@ class TestRoleHistoryRW extends BaseMockAppStateTest { assert loadedNE2.lastUsed == savetime assert rh2.thawedDataTime == savetime - // now thaw it + // now start it rh2.buildAvailableNodeLists(); - describe("thawing") + describe("starting") rh2.dump(); List<NodeInstance> available0 = rh2.cloneAvailableList(0) assert available0.size() == 1 http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy index 5aef585..f1fd6de 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy @@ -710,15 +710,15 @@ public abstract class YarnMiniClusterTestBase extends ServiceLauncherBaseTest { * @return the exit code */ public int clusterActionFreeze(SliderClient sliderClient, String clustername, - String message = "action freeze") { - log.info("Freezing cluster $clustername: $message") + String message = "action stop") { + log.info("Stopping cluster $clustername: $message") ActionFreezeArgs freezeArgs = new ActionFreezeArgs(); freezeArgs.waittime = CLUSTER_STOP_TIME freezeArgs.message = message int exitCode = sliderClient.actionFreeze(clustername, freezeArgs); if (exitCode != 0) { - log.warn("Cluster freeze failed with error code $exitCode") + log.warn("Cluster stop failed with error code $exitCode") } return exitCode } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-core/src/test/resources/example-slider-test.xml ---------------------------------------------------------------------- diff --git a/slider-core/src/test/resources/example-slider-test.xml b/slider-core/src/test/resources/example-slider-test.xml index a752cfd..abf42f9 100644 --- a/slider-core/src/test/resources/example-slider-test.xml +++ b/slider-core/src/test/resources/example-slider-test.xml @@ -40,13 +40,13 @@ <property> <name>slider.test.thaw.wait.seconds</name> - <description>Time to wait for a thaw to work</description> + <description>Time to wait for a start to work</description> <value>60</value> </property> <property> <name>slider.test.freeze.wait.seconds</name> - <description>Time to wait for a freeze to work</description> + <description>Time to wait for a stop to work</description> <value>60</value> </property> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/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 278bd2b..3b52912 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 @@ -220,7 +220,7 @@ abstract class CommandTestBase extends SliderTestUtils { } /** - * Freeze cluster: no exit code checking + * Stop cluster: no exit code checking * @param name * @param args * @return http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/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 6b0f2bd..51f1e94 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 @@ -88,7 +88,7 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase //destroy will fail in use destroy(EXIT_APPLICATION_IN_USE, CLUSTER) - //thaw will fail as cluster is in use + //start will fail as cluster is in use thaw(EXIT_APPLICATION_IN_USE, CLUSTER) //it's still there @@ -125,7 +125,7 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase log.info("Connected via Client {}", sliderClient.toString()) - //freeze + //stop freeze(0, CLUSTER, [ ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), ARG_MESSAGE, "freeze-in-test-cluster-lifecycle" @@ -137,7 +137,7 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase //condition returns false if it is required to be live exists(EXIT_FALSE, CLUSTER, true) - //thaw then freeze the cluster + //start then stop the cluster thaw(CLUSTER, [ ARG_WAIT, Integer.toString(THAW_WAIT_TIME), @@ -160,7 +160,7 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase //condition returns false if it is required to be live exists(EXIT_FALSE, CLUSTER, true) - //thaw with a restart count set to enable restart + //start with a restart count set to enable restart describe "the kill/restart phase may fail if yarn.resourcemanager.am.max-attempts is too low" thaw(CLUSTER, [ http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-funtest/src/test/manual/python/SliderTester.py ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/manual/python/SliderTester.py b/slider-funtest/src/test/manual/python/SliderTester.py index 40bdf2b..1dfd0b5 100644 --- a/slider-funtest/src/test/manual/python/SliderTester.py +++ b/slider-funtest/src/test/manual/python/SliderTester.py @@ -235,7 +235,7 @@ class SliderTester: pass def clean_up(self): - (retcode, out, err) = self.run_slider_command(" ".join([self.slider_exec, "freeze", self.cluster_name]), + (retcode, out, err) = self.run_slider_command(" ".join([self.slider_exec, "stop", self.cluster_name]), self.slider_user) if retcode != 0: raise Exception("Could not clean cluster. Out: " + out + " Err: " + err) @@ -352,7 +352,7 @@ def main(): # Finalize resources and appConf json files # Call create # Validate existence of the app - # Call freeze + # Call start if __name__ == "__main__": http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/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 6da00fb..108bab2 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 @@ -68,8 +68,8 @@ class TestAccFreezeThaw extends AccumuloTestBase { AccumuloKeys.MONITOR_PAGE_JSON) log.info(page); - log.info("Freezing") - clusterActionFreeze(sliderClient, clustername, "freeze"); + log.info("Stopping") + clusterActionFreeze(sliderClient, clustername, "stop"); waitForAppToFinish(sliderClient) //make sure the fetch fails http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/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 63b5fb6..c65593f 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 @@ -80,7 +80,7 @@ public class HBaseClusterLifecycleIT extends HBaseCommandTestBase destroy(EXIT_APPLICATION_IN_USE, CLUSTER) - //thaw will fail as cluster is in use + //start will fail as cluster is in use thaw(EXIT_APPLICATION_IN_USE, CLUSTER) //it's still there @@ -117,7 +117,7 @@ public class HBaseClusterLifecycleIT extends HBaseCommandTestBase log.info("Connected via Client {}", sliderClient.toString()) - //freeze + //stop def frozen = freeze(0, CLUSTER, [ ARG_WAIT, Integer.toString(FREEZE_WAIT_TIME), ARG_MESSAGE, "freeze-in-test-cluster-lifecycle" @@ -131,7 +131,7 @@ public class HBaseClusterLifecycleIT extends HBaseCommandTestBase exists(EXIT_FALSE, CLUSTER, true) - // thaw then freeze the cluster + // start then stop the cluster thaw(CLUSTER, [ @@ -151,7 +151,7 @@ public class HBaseClusterLifecycleIT extends HBaseCommandTestBase // condition returns false if it is required to be live exists(EXIT_FALSE, CLUSTER, true) - // thaw with a restart count set to enable restart + // start with a restart count set to enable restart describe "the kill/restart phase may fail if yarn.resourcemanager.am.max-attempts is too low" thaw(CLUSTER, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy index 85726a7..09a87a9 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/archives/TestFreezeThawClusterFromArchive.groovy @@ -51,7 +51,7 @@ class TestFreezeThawClusterFromArchive extends HBaseMiniClusterTestBase { hbaseClusterStartupToLiveTime) - clusterActionFreeze(sliderClient, clustername, "test freeze") + clusterActionFreeze(sliderClient, clustername, "test stop") describe("Restarting cluster") killAllRegionServers(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy index c305b5b..e4acb6b 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/build/TestBuildThawClusterM1W1.groovy @@ -61,7 +61,7 @@ class TestBuildThawClusterM1W1 extends HBaseMiniClusterTestBase { ApplicationReport report = serviceRegistryClient.findInstance(clustername) assert report == null; - //thaw time + //start time ServiceLauncher<SliderClient> l2 = thawCluster(clustername, [], true) SliderClient thawed = l2.service addToTeardown(thawed); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy index f6748e0..d01716b 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeReconfigureThawLiveRegionService.groovy @@ -54,8 +54,8 @@ class TestFreezeReconfigureThawLiveRegionService conf.setInt("yarn.nodemanager.resource.cpu-vcores", 1) String clustername = createMiniCluster("", conf, nodemanagers, true) describe( - "Create a $regionServerCount node cluster, freeze it, patch the configuration files," + - " thaw it and verify that it came back with the new settings") + "Create a $regionServerCount node cluster, stop it, patch the configuration files," + + " start it and verify that it came back with the new settings") ServiceLauncher<SliderClient> launcher = createHBaseCluster( clustername, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy index 66dd4f0..9a0e1db 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/freezethaw/TestFreezeThawLiveRegionService.groovy @@ -43,7 +43,7 @@ class TestFreezeThawLiveRegionService extends HBaseMiniClusterTestBase { public void testFreezeThawLiveRegionService() throws Throwable { int regionServerCount = 2 String clustername = createMiniCluster("", configuration, 1, true) - describe("Create a cluster, freeze it, thaw it and verify that it came back ") + describe("Create a cluster, stop it, start it and verify that it came back ") //use a smaller AM HEAP to include it in the test cycle ServiceLauncher launcher = createHBaseCluster(clustername, regionServerCount, [ @@ -84,7 +84,7 @@ class TestFreezeThawLiveRegionService extends HBaseMiniClusterTestBase { waitForHBaseRegionServerCount(newCluster, clustername, regionServerCount, hbaseClusterStartupToLiveTime) - // finally, attempt to thaw it while it is running + //finally, attempt to start it while it is running //now let's start the cluster up again try { ServiceLauncher launcher3 = thawCluster(clustername, [], true); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/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 7e4c5ed..f7bb8d2 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 @@ -109,8 +109,8 @@ class TestTwoLiveClusters extends HBaseMiniClusterTestBase { HBaseKeys.HBASE_SERVICE_TYPE, clustername2).payload assert !(hbase1ServiceData == hbase2ServiceData) - clusterActionFreeze(cluster2Client, clustername2,"freeze cluster 2") - clusterActionFreeze(sliderClient, clustername1,"Freeze cluster 1") + clusterActionFreeze(cluster2Client, clustername2, "stop cluster 2") + clusterActionFreeze(sliderClient, clustername1, "Stop cluster 1") } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/src/test/clusters/sandbox/operations.md ---------------------------------------------------------------------- diff --git a/src/test/clusters/sandbox/operations.md b/src/test/clusters/sandbox/operations.md index 0ff5a3a..932f6d5 100644 --- a/src/test/clusters/sandbox/operations.md +++ b/src/test/clusters/sandbox/operations.md @@ -118,10 +118,10 @@ - bin/slider thaw cl1 + bin/slider start cl1 - bin/slider freeze cl1 - bin/slider freeze cluster3 + bin/slider stop cl1 + bin/slider stop cluster3 bin/slider destroy cl1 @@ -149,20 +149,20 @@ --component master 1 \ --component worker 2 -### freeze +### stop - bin/slider freeze cl1 + bin/slider stop cl1 - bin/slider freeze cl1 --force + bin/slider stop cl1 --force -### thaw +### start - bin/slider thaw cl1 -D slider.yarn.queue.priority=5 -D slider.yarn.queue=default + bin/slider start cl1 -D slider.yarn.queue.priority=5 -D slider.yarn.queue=default -### thaw with bad queue: _MUST_ fail +### start with bad queue: _MUST_ fail - bin/slider thaw cl1 -D slider.yarn.queue=unknown + bin/slider start cl1 -D slider.yarn.queue=unknown ### monitor http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/266df5c1/src/test/clusters/ubuntu-secure/operations.md ---------------------------------------------------------------------- diff --git a/src/test/clusters/ubuntu-secure/operations.md b/src/test/clusters/ubuntu-secure/operations.md index d894038..1f92290 100644 --- a/src/test/clusters/ubuntu-secure/operations.md +++ b/src/test/clusters/ubuntu-secure/operations.md @@ -198,21 +198,21 @@ - bin/slider thaw cl1 \ + bin/slider start cl1 \ --manager ubuntu:8032 --filesystem hdfs://ubuntu:9090 \ \ -S java.security.krb5.realm=COTHAM -S java.security.krb5.kdc=ubuntu \ -D yarn.resourcemanager.principal=yarn/ubuntu@COTHAM \ -D dfs.namenode.kerberos.principal=hdfs/ubuntu@COTHAM - bin/slider freeze cl1 \ + bin/slider stop cl1 \ --manager ubuntu:8032 --filesystem hdfs://ubuntu:9090 \ \ -S java.security.krb5.realm=COTHAM -S java.security.krb5.kdc=ubuntu \ -D yarn.resourcemanager.principal=yarn/ubuntu@COTHAM \ -D dfs.namenode.kerberos.principal=hdfs/ubuntu@COTHAM - bin/slider freeze cluster3 \ + bin/slider stop cluster3 \ --manager ubuntu:8032 --filesystem hdfs://ubuntu:9090 \ \ -S java.security.krb5.realm=COTHAM -S java.security.krb5.kdc=ubuntu \ @@ -259,13 +259,13 @@ --role master 1 \ --role worker 2 -# freeze +# stop - bin/slider freeze cl1 + bin/slider stop cl1 -# thaw +# start - bin/slider thaw cl1 + bin/slider start cl1 # monitor
