Merge branch 'develop' into feature/SLIDER-280_Restart_AM_fun_tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/278d5e4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/278d5e4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/278d5e4c Branch: refs/heads/feature/SLIDER-280_Restart_AM_fun_tests Commit: 278d5e4c7342fc43ccb4324008b3351e35ec7bcb Parents: 71021f0 930920d Author: Sumit Mohanty <[email protected]> Authored: Thu Sep 4 12:38:21 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Thu Sep 4 12:38:21 2014 -0700 ---------------------------------------------------------------------- README.md | 32 +- app-packages/accumulo/README.txt | 55 +- app-packages/accumulo/appConfig.json | 32 +- app-packages/accumulo/metainfo.xml | 16 + .../accumulo/package/scripts/accumulo_client.py | 2 +- .../package/scripts/accumulo_configuration.py | 64 +- .../accumulo/package/scripts/accumulo_script.py | 53 +- .../package/scripts/accumulo_service.py | 2 +- app-packages/accumulo/package/scripts/params.py | 28 +- .../package/templates/accumulo-env.sh.j2 | 2 +- .../accumulo/package/templates/client.conf.j2 | 18 + app-packages/accumulo/pom.xml | 41 +- app-packages/accumulo/src/assembly/accumulo.xml | 24 +- .../slider/accumulo/CustomAuthenticator.java | 118 ++++ .../apache/slider/accumulo/ProviderUtil.java | 57 ++ .../AccumuloAgentCommandTestBase.groovy | 10 +- .../funtest/accumulo/AccumuloBasicIT.groovy | 96 ++- .../accumulo/AccumuloMonitorSSLIT.groovy | 2 +- .../funtest/accumulo/AccumuloReadWriteIT.groovy | 7 +- .../accumulo/AccumuloReadWriteSSLIT.groovy | 73 +++ .../funtest/accumulo/AccumuloSSLTestBase.groovy | 105 ++++ .../slider/funtest/accumulo/CertUtil.java | 235 +++++++ .../src/test/resources/appConfig_kerberos.json | 55 ++ .../test/resources/appConfig_monitor_ssl.json | 35 +- .../src/test/resources/appConfig_ssl.json | 55 ++ .../accumulo/src/test/resources/resources.json | 4 +- .../test/resources/resources_with_client.json | 41 ++ app-packages/app-pkg-template/appConfig.json | 2 +- app-packages/app-pkg-template/metainfo.xml | 8 +- .../command-logger/slider-pkg/appConfig.json | 2 - .../command-logger/slider-pkg/metainfo.xml | 8 + app-packages/hbase-win/README.txt | 34 + app-packages/hbase-win/appConfig.json | 44 ++ .../hbase-win/configuration/hbase-env.xml | 54 ++ .../hbase-win/configuration/hbase-log4j.xml | 143 +++++ .../hbase-win/configuration/hbase-policy.xml | 53 ++ .../hbase-win/configuration/hbase-site.xml | 370 +++++++++++ app-packages/hbase-win/jmx_metrics.json | 56 ++ app-packages/hbase-win/metainfo.xml | 129 ++++ ...se-0.98.0.2.1.5.0-2047-hadoop2.zip.REPLACEME | 17 + .../hbase-win/package/scripts/__init__.py | 19 + .../hbase-win/package/scripts/functions.py | 40 ++ app-packages/hbase-win/package/scripts/hbase.py | 66 ++ .../hbase-win/package/scripts/hbase_master.py | 63 ++ .../package/scripts/hbase_regionserver.py | 63 ++ .../hbase-win/package/scripts/hbase_service.py | 48 ++ .../hbase-win/package/scripts/params.py | 81 +++ .../hbase-win/package/scripts/status_params.py | 26 + .../package/templates/hbase_client_jaas.conf.j2 | 22 + .../package/templates/hbase_master_jaas.conf.j2 | 25 + .../templates/hbase_regionserver_jaas.conf.j2 | 25 + app-packages/hbase-win/resources.json | 21 + app-packages/hbase/appConfig.json | 105 ++-- app-packages/hbase/configuration/global.xml | 160 ----- app-packages/hbase/configuration/hbase-env.xml | 117 ++++ .../hbase/configuration/hbase-log4j.xml | 1 + app-packages/hbase/configuration/hbase-site.xml | 19 +- app-packages/hbase/get-hbase-site.sh | 15 + app-packages/hbase/metainfo.xml | 24 + app-packages/hbase/package/scripts/hbase.py | 28 +- app-packages/hbase/package/scripts/params.py | 26 +- .../hbase/package/templates/hbase-env.sh.j2 | 81 --- app-packages/hbase/pom.xml | 4 +- app-packages/memcached-win/appConfig.json | 6 +- app-packages/memcached-win/metainfo.xml | 8 +- app-packages/memcached/appConfig.json | 4 +- app-packages/memcached/metainfo.xml | 8 +- app-packages/storm/README.txt | 19 +- app-packages/storm/appConfig.json | 103 +-- app-packages/storm/configuration/global.xml | 39 -- app-packages/storm/configuration/storm-env.xml | 65 ++ app-packages/storm/configuration/storm-site.xml | 15 +- app-packages/storm/metainfo.xml | 40 +- ...pache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE | 16 - app-packages/storm/package/scripts/params.py | 19 +- app-packages/storm/package/scripts/service.py | 8 + .../storm/package/scripts/status_params.py | 4 +- app-packages/storm/package/scripts/storm.py | 7 +- .../storm/package/scripts/yaml_config.py | 7 +- .../storm/package/templates/config.yaml.j2 | 9 - .../storm/package/templates/storm_jaas.conf.j2 | 27 +- app-packages/storm/pom.xml | 90 +++ app-packages/storm/resources.json | 10 +- app-packages/storm/src/assembly/storm.xml | 68 ++ pom.xml | 59 +- slider-agent/src/main/python/agent/Constants.py | 1 + .../src/main/python/agent/Controller.py | 2 +- .../python/agent/CustomServiceOrchestrator.py | 10 +- slider-agent/src/main/python/agent/Register.py | 5 +- slider-agent/src/main/python/agent/Registry.py | 9 +- slider-agent/src/main/python/agent/main.py | 60 +- slider-agent/src/main/python/kazoo/client.py | 6 +- .../src/main/python/kazoo/handlers/threading.py | 6 +- .../src/main/python/kazoo/handlers/utils.py | 87 ++- .../main/python/kazoo/protocol/connection.py | 16 +- .../src/main/python/kazoo/tests/test_client.py | 6 +- .../main/python/kazoo/tests/test_connection.py | 55 +- .../core/providers/__init__.py | 33 +- .../core/providers/system.py | 8 + .../core/providers/windows/system.py | 74 ++- .../core/providers/windows/tarball.py | 46 ++ .../core/resources/system.py | 1 + .../libraries/functions/check_process_status.py | 44 +- .../libraries/script/script.py | 2 +- slider-agent/src/test/python/agent/TestMain.py | 19 +- .../src/test/python/agent/TestRegistration.py | 19 +- .../python/resource_management/TestPackage.py | 32 + slider-agent/src/test/python/unitTests.py | 1 + slider-assembly/pom.xml | 8 +- slider-assembly/src/conf/slider-client.xml | 4 + slider-assembly/src/main/bash/README.md | 2 +- slider-assembly/src/main/bash/slider_destroy | 4 +- slider-assembly/src/main/scripts/slider | 3 +- slider-assembly/src/main/scripts/slider.py | 21 +- .../org/apache/slider/api/InternalKeys.java | 11 + .../org/apache/slider/api/ResourceKeys.java | 13 - .../org/apache/slider/client/SliderClient.java | 132 +++- .../org/apache/slider/common/SliderKeys.java | 7 + .../common/SliderXMLConfKeysForTesting.java | 6 +- .../common/params/AbstractActionArgs.java | 11 + .../slider/common/params/ActionFreezeArgs.java | 2 +- .../slider/common/params/ActionHelpArgs.java | 14 +- .../slider/common/params/ActionVersionArgs.java | 12 +- .../common/params/LaunchArgsAccessor.java | 2 +- .../slider/common/params/SliderActions.java | 8 +- .../apache/slider/common/tools/SliderUtils.java | 622 ++++++++++++++----- .../slider/core/build/InstanceBuilder.java | 5 +- .../org/apache/slider/core/conf/ConfTree.java | 7 + .../slider/core/conf/ConfTreeOperations.java | 4 +- .../apache/slider/core/zk/ZookeeperUtils.java | 3 +- .../slider/providers/agent/AgentKeys.java | 1 + .../providers/agent/AgentProviderService.java | 256 ++++++-- .../slider/providers/agent/AgentUtils.java | 31 +- .../agent/application/metadata/Application.java | 11 +- .../agent/application/metadata/Component.java | 6 + .../agent/application/metadata/ConfigFile.java | 53 ++ .../metadata/ConfigurationDependencies.java | 39 -- .../application/metadata/DefaultConfig.java | 39 ++ .../metadata/DefaultConfigParser.java | 54 ++ .../application/metadata/MetainfoParser.java | 9 +- .../application/metadata/PropertyInfo.java | 54 ++ .../server/appmaster/RoleLaunchService.java | 8 +- .../server/appmaster/SliderAppMaster.java | 200 +++--- .../server/appmaster/actions/ActionHalt.java | 6 +- .../appmaster/actions/ActionKillContainer.java | 20 +- .../appmaster/actions/ActionStartContainer.java | 8 +- .../appmaster/actions/ActionStopSlider.java | 6 +- .../server/appmaster/actions/AsyncAction.java | 47 +- .../actions/ProviderReportedContainerLoss.java | 13 +- .../actions/ProviderStartupCompleted.java | 4 - .../server/appmaster/actions/QueueAccess.java | 5 + .../server/appmaster/actions/QueueService.java | 11 +- .../actions/RegisterComponentInstance.java | 5 + .../appmaster/actions/RenewingAction.java | 36 +- .../actions/ReviewAndFlexApplicationSize.java | 43 ++ .../actions/UnregisterComponentInstance.java | 7 +- .../server/appmaster/monkey/ChaosEntry.java | 2 +- .../appmaster/monkey/ChaosMonkeyService.java | 46 +- .../slider/server/appmaster/state/AppState.java | 11 +- .../server/appmaster/state/NodeEntry.java | 2 +- .../server/appmaster/state/RoleHistory.java | 6 +- .../server/appmaster/web/AgentService.java | 28 +- .../web/SliderAmFilterInitializer.java | 71 --- .../server/appmaster/web/SliderAmIpFilter.java | 155 ----- .../appmaster/web/rest/agent/AgentWebApp.java | 16 +- .../appmaster/web/rest/agent/Register.java | 13 + .../services/security/CertificateManager.java | 54 +- .../security/FsDelegationTokenManager.java | 257 ++++++++ .../services/utility/EndOfServiceWaiter.java | 84 +++ .../LaunchedWorkflowCompositeService.java | 4 + .../services/workflow/ClosingService.java | 3 + .../services/workflow/ForkedProcessService.java | 21 +- .../services/workflow/LongLivedProcess.java | 57 +- .../test_command_log/appConfig.json | 2 - .../test_command_log/appConfig_fast_no_reg.json | 2 - .../test_command_log/appConfig_no_hb.json | 2 - .../agent/AgentMiniClusterTestBase.groovy | 18 +- .../agent/actions/TestActionExists.groovy | 2 +- .../agent/actions/TestActionVersion.groovy | 5 +- .../agent/freezethaw/TestFreezeCommands.groovy | 10 +- .../TestFreezeThawMasterlessAM.groovy | 8 +- .../freezethaw/TestFreezeUnknownCluster.groovy | 2 +- .../standalone/TestBuildStandaloneAM.groovy | 2 +- .../standalone/TestStandaloneAMDestroy.groovy | 6 +- .../TestStandaloneAMMonkeyRestart.groovy | 12 +- .../standalone/TestStandaloneRegistryAM.groovy | 2 +- .../slider/client/TestCommonArgParsing.groovy | 2 +- .../tools/TestClientResourceRegistration.groovy | 3 + .../common/tools/TestConfigHelperHDFS.groovy | 3 + .../tools/TestExecutionEnvironment.groovy | 42 ++ .../common/tools/TestMiscSliderUtils.groovy | 3 + .../common/tools/TestWindowsSupport.groovy | 182 ++++++ .../common/tools/TestZKIntegration.groovy | 54 +- .../slider/providers/agent/AgentTestBase.groovy | 10 + .../agent/TestAgentAMManagementWS.groovy | 8 +- .../slider/providers/agent/TestAgentEcho.groovy | 6 +- .../curator/TestRegistryRestResources.groovy | 6 +- .../model/history/TestRoleHistoryRW.groovy | 4 +- .../model/monkey/TestMockMonkey.groovy | 41 +- .../publisher/TestPublisherRestResources.groovy | 23 +- .../TestFsDelegationTokenManager.groovy | 244 ++++++++ .../apache/slider/test/SliderTestBase.groovy | 2 +- .../apache/slider/test/SliderTestUtils.groovy | 48 ++ .../slider/test/YarnMiniClusterTestBase.groovy | 51 +- .../test/YarnZKMiniClusterTestBase.groovy | 2 +- .../agent/TestAgentProviderService.java | 136 +++- .../application/metadata/TestConfigParser.java | 107 ++++ .../metadata/TestMetainfoParser.java | 7 + .../appmaster/web/TestSliderAmFilter.java | 200 ------ .../web/rest/agent/TestAMAgentWebServices.java | 51 +- .../services/workflow/EndOfServiceWaiter.java | 56 -- .../workflow/ProcessCommandFactory.java | 21 +- .../services/workflow/TestLongLivedProcess.java | 6 +- .../workflow/TestWorkflowClosingService.java | 4 +- .../TestWorkflowForkedProcessService.java | 4 +- .../workflow/WorkflowServiceTestBase.java | 3 +- .../src/test/resources/example-slider-test.xml | 4 +- .../slider/common/tools/test/metainfo.xml | 11 +- .../framework/AgentCommandTestBase.groovy | 5 +- .../funtest/framework/CommandTestBase.groovy | 2 +- .../lifecycle/AgentClusterLifecycleIT.groovy | 8 +- .../src/test/manual/python/SliderTester.py | 4 +- .../accumulo/slider-accumulo-provider/pom.xml | 6 + .../providers/accumulo/AccumuloTestBase.groovy | 11 +- .../accumulo/live/TestAccFreezeThaw.groovy | 4 +- .../funtest/HBaseClusterLifecycleIT.groovy | 8 +- .../minicluster/HBaseMiniClusterTestBase.groovy | 10 +- .../TestFreezeThawClusterFromArchive.groovy | 2 +- .../build/TestBuildThawClusterM1W1.groovy | 2 +- .../failures/TestKilledHBaseAM.groovy | 1 - .../flexing/TestClusterFlex1To1.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 +- 236 files changed, 6500 insertions(+), 2165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/278d5e4c/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java ---------------------------------------------------------------------- diff --cc slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java index 40c3c45,16f5347..6087f9a --- a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java +++ b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java @@@ -41,11 -41,13 +42,14 @@@ import org.apache.slider.core.conf.Conf import org.apache.slider.core.conf.MapOperations; import org.apache.slider.core.exceptions.SliderException; import org.apache.slider.core.launch.ContainerLauncher; +import org.apache.slider.providers.ProviderRole; import org.apache.slider.providers.agent.application.metadata.Application; import org.apache.slider.providers.agent.application.metadata.CommandOrder; + import org.apache.slider.providers.agent.application.metadata.CommandScript; import org.apache.slider.providers.agent.application.metadata.Component; import org.apache.slider.providers.agent.application.metadata.ComponentExport; + import org.apache.slider.providers.agent.application.metadata.ConfigFile; + import org.apache.slider.providers.agent.application.metadata.DefaultConfig; import org.apache.slider.providers.agent.application.metadata.Export; import org.apache.slider.providers.agent.application.metadata.ExportGroup; import org.apache.slider.providers.agent.application.metadata.Metainfo;
