SLIDER-434. Modify default application package locations to the default upload location
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0d41051a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0d41051a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0d41051a Branch: refs/heads/feature/SLIDER-158_slider_diagnostic_option Commit: 0d41051a40709071336e1f2331eb0167edf5cd1a Parents: 5ab149c Author: Sumit Mohanty <[email protected]> Authored: Sat Sep 20 23:40:06 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Sat Sep 20 23:40:06 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig.json | 2 +- app-packages/accumulo/pom.xml | 1 + .../command-logger/slider-pkg/appConfig.json | 2 +- app-packages/hbase-win/appConfig.json | 2 +- app-packages/hbase/appConfig.json | 2 +- app-packages/memcached-win/appConfig.json | 2 +- app-packages/memcached/appConfig.json | 2 +- app-packages/storm/appConfig.json | 2 +- .../test_command_log/appConfig.json | 4 +-- .../test_command_log/appConfig_fast_no_reg.json | 3 +- .../test_command_log/appConfig_no_hb.json | 4 +-- slider-funtest/pom.xml | 1 + .../framework/AgentCommandTestBase.groovy | 31 +++++++------------- .../funtest/lifecycle/AMFailuresIT.groovy | 1 - .../lifecycle/AgentClusterLifecycleIT.groovy | 1 - .../funtest/lifecycle/AgentFailures2IT.groovy | 1 - .../funtest/lifecycle/AgentFailuresIT.groovy | 1 - .../funtest/lifecycle/AppsThroughAgentIT.groovy | 2 +- .../lifecycle/ClusterBuildDestroyIT.groovy | 1 - 19 files changed, 24 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/accumulo/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/appConfig.json b/app-packages/accumulo/appConfig.json index d6f849c..28fb637 100644 --- a/app-packages/accumulo/appConfig.json +++ b/app-packages/accumulo/appConfig.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": "${app.package.name}.zip", + "application.def": ".slider/package/ACCUMULO/${app.package.name}.zip", "java_home": "/usr/lib/jvm/java", "site.global.app_user": "${app.user}", "site.global.app_log_dir": "${AGENT_LOG_ROOT}", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml index c7d007e..02a0a72 100644 --- a/app-packages/accumulo/pom.xml +++ b/app-packages/accumulo/pom.xml @@ -190,6 +190,7 @@ <slider.bin.dir>${slider.bin.dir}</slider.bin.dir> <test.app.pkg.dir>${test.app.pkg.dir}</test.app.pkg.dir> <test.app.pkg.file>${app.package.name}.zip</test.app.pkg.file> + <test.app.pkg.name>ACCUMULO</test.app.pkg.name> <test.app.resources.dir>${test.app.resources.dir}</test.app.resources.dir> </systemPropertyVariables> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/command-logger/slider-pkg/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json index 791043f..73bc7fa 100644 --- a/app-packages/command-logger/slider-pkg/appConfig.json +++ b/app-packages/command-logger/slider-pkg/appConfig.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": "apache-slider-command-logger.zip", + "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", "java_home": "/usr/jdk64/jdk1.7.0_45", "site.global.app_user": "yarn", "site.global.application_id": "CommandLogger", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/hbase-win/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/appConfig.json b/app-packages/hbase-win/appConfig.json index 8261f8c..94f1343 100644 --- a/app-packages/hbase-win/appConfig.json +++ b/app-packages/hbase-win/appConfig.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": "${app.package.name}.zip", + "application.def": ".slider/package/HBASE/${app.package.name}.zip", "create.default.zookeeper.node": "true", "java_home": "/usr/jdk64/jdk1.7.0_45", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/hbase/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/appConfig.json b/app-packages/hbase/appConfig.json index 3743602..78479db 100644 --- a/app-packages/hbase/appConfig.json +++ b/app-packages/hbase/appConfig.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": "slider-hbase-app-package-${bld.version}.zip", + "application.def": ".slider/package/HBASE/slider-hbase-app-package-${bld.version}.zip", "create.default.zookeeper.node": "true", "java_home": "/usr/jdk64/jdk1.7.0_45", "system_configs": "core-site", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/memcached-win/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached-win/appConfig.json b/app-packages/memcached-win/appConfig.json index fa4050b..7863579 100644 --- a/app-packages/memcached-win/appConfig.json +++ b/app-packages/memcached-win/appConfig.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": "jmemcached-1.0.0.zip", + "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", "java_home": "C:\\java", "site.global.app_user": "hadoop", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/memcached/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached/appConfig.json b/app-packages/memcached/appConfig.json index c335959..cf4a838 100644 --- a/app-packages/memcached/appConfig.json +++ b/app-packages/memcached/appConfig.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": "jmemcached-1.0.0.zip", + "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", "java_home": "/usr/jdk64/jdk1.7.0_45", "site.global.app_user": "yarn", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/app-packages/storm/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/appConfig.json b/app-packages/storm/appConfig.json index 4af092d..9a926c2 100644 --- a/app-packages/storm/appConfig.json +++ b/app-packages/storm/appConfig.json @@ -3,7 +3,7 @@ "metadata": { }, "global": { - "application.def": "slider-storm-app-package-${pkg.version}.zip", + "application.def": ".slider/package/STORM/slider-storm-app-package-${pkg.version}.zip", "java_home": "/usr/jdk64/jdk1.7.0_45", "create.default.zookeeper.node": "true", "system_configs": "core-site", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-core/src/test/app_packages/test_command_log/appConfig.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig.json b/slider-core/src/test/app_packages/test_command_log/appConfig.json index 7586a0c..8e81421 100644 --- a/slider-core/src/test/app_packages/test_command_log/appConfig.json +++ b/slider-core/src/test/app_packages/test_command_log/appConfig.json @@ -3,15 +3,13 @@ "metadata": { }, "global": { - "agent.conf": "agent.ini", - "application.def": "apache-slider-command-logger.zip", + "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", "java_home": "/usr/jdk64/jdk1.7.0_45", "site.global.app_user": "yarn", "site.global.application_id": "CommandLogger", "site.global.app_log_dir": "${AGENT_LOG_ROOT}/app/log", "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run", "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger", - "site.global.app_install_dir": "${AGENT_WORK_ROOT}/app/install", "site.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log", "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p" }, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json b/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json index cbe28de..76858e7 100644 --- a/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json +++ b/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json @@ -5,8 +5,7 @@ "global": { "heartbeat.monitor.interval": "20000", "agent.instance.debug.data": "ANY:DO_NOT_REGISTER:NONE", - "agent.conf": "agent.ini", - "application.def": "apache-slider-command-logger.zip", + "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", "java_home": "/usr/jdk64/jdk1.7.0_45", "site.global.app_user": "yarn", "site.global.application_id": "CommandLogger", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json b/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json index 41c4709..49ec4b7 100644 --- a/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json +++ b/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json @@ -5,15 +5,13 @@ "global": { "heartbeat.monitor.interval": "20000", "agent.instance.debug.data": "ANY:DO_NOT_HEARTBEAT:DO_NOT_HEARTBEAT:NONE", - "agent.conf": "agent.ini", - "application.def": "apache-slider-command-logger.zip", + "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", "java_home": "/usr/jdk64/jdk1.7.0_45", "site.global.app_user": "yarn", "site.global.application_id": "CommandLogger", "site.global.app_log_dir": "${AGENT_LOG_ROOT}/app/log", "site.global.app_pid_dir": "${AGENT_WORK_ROOT}/app/run", "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger", - "site.global.app_install_dir": "${AGENT_WORK_ROOT}/app/install", "site.cl-site.logfile.location": "${AGENT_LOG_ROOT}/app/log/operations.log", "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p" }, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-funtest/pom.xml ---------------------------------------------------------------------- diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml index 55b6351..295b8eb 100644 --- a/slider-funtest/pom.xml +++ b/slider-funtest/pom.xml @@ -119,6 +119,7 @@ <slider.bin.dir>../slider-assembly/target/slider-${project.version}-all/slider-${project.version}</slider.bin.dir> <test.app.pkg.dir>../app-packages/command-logger/slider-pkg/target</test.app.pkg.dir> <test.app.pkg.file>apache-slider-command-logger.zip</test.app.pkg.file> + <test.app.pkg.name>CMD_LOGGER</test.app.pkg.name> <test.app.resource>../slider-core/src/test/app_packages/test_command_log/resources.json</test.app.resource> <test.app.template>../slider-core/src/test/app_packages/test_command_log/appConfig.json</test.app.template> <vagrant.current.working.dir>/Users/gsaha/work/workspace/ambari-vagrant/centos6.4</vagrant.current.working.dir> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy index b565cd1..f1edff4 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy @@ -37,6 +37,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { public static final boolean AGENTTESTS_ENABLED private static String TEST_APP_PKG_DIR_PROP = "test.app.pkg.dir" private static String TEST_APP_PKG_FILE_PROP = "test.app.pkg.file" + private static String TEST_APP_PKG_NAME_PROP = "test.app.pkg.name" private static String TEST_APP_RESOURCE = "test.app.resource" private static String TEST_APP_TEMPLATE = "test.app.template" @@ -45,6 +46,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { protected String APP_TEMPLATE = getAppTemplate() public static final String TEST_APP_PKG_DIR = sysprop(TEST_APP_PKG_DIR_PROP) public static final String TEST_APP_PKG_FILE = sysprop(TEST_APP_PKG_FILE_PROP) + public static final String TEST_APP_PKG_NAME = sysprop(TEST_APP_PKG_NAME_PROP) protected static Path agentTarballPath; @@ -79,29 +81,18 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { } @Before - public void uploadAgentTarball() { - def agentUploads = new AgentUploads(SLIDER_CONFIG) - (agentTarballPath, agtIniPath) = - agentUploads.uploadAgentFiles(SLIDER_TAR_DIRECTORY, false) - } - - - @Before public void setupApplicationPackage() { try { - AgentUploads agentUploads = new AgentUploads(SLIDER_CONFIG) - agentUploads.uploader.mkHomeDir() - - appPkgPath = new Path(clusterFS.homeDirectory, TEST_APP_PKG_FILE) - if (clusterFS.exists(appPkgPath)) { - clusterFS.delete(appPkgPath, false) - log.info "Existing app pkg deleted from $appPkgPath" - } - File zipFileName = new File(TEST_APP_PKG_DIR, TEST_APP_PKG_FILE).canonicalFile - agentUploads.uploader.copyIfOutOfDate(zipFileName, appPkgPath, false) - assert clusterFS.exists(appPkgPath), "App pkg not uploaded to $appPkgPath" - log.info "App pkg uploaded at $appPkgPath" + SliderShell shell = slider(EXIT_SUCCESS, + [ + ACTION_INSTALL_PACKAGE, + Arguments.ARG_NAME, TEST_APP_PKG_NAME, + Arguments.ARG_PACKAGE, zipFileName, + Arguments.ARG_REPLACE_PKG + ]) + logShell(shell) + log.info "App pkg uploaded at home directory .slider/package/$TEST_APP_PKG_NAME/$TEST_APP_PKG_FILE" } catch (Exception e) { setup_failed = true throw e; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy index b92207c..852121f 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMFailuresIT.groovy @@ -57,7 +57,6 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { SliderShell shell = slider(EXIT_SUCCESS, [ ACTION_CREATE, APPLICATION_NAME, - ARG_IMAGE, agentTarballPath.toString(), ARG_TEMPLATE, APP_TEMPLATE, ARG_RESOURCES, APP_RESOURCE ]) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/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 51f1e94..73ca275 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 @@ -68,7 +68,6 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase SliderShell shell = slider(EXIT_SUCCESS, [ ACTION_CREATE, CLUSTER, - ARG_IMAGE, agentTarballPath.toString(), ARG_TEMPLATE, APP_TEMPLATE, ARG_RESOURCES, APP_RESOURCE2 ]) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy index 0ba48ba..9359521 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy @@ -56,7 +56,6 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { SliderShell shell = slider(EXIT_SUCCESS, [ ACTION_CREATE, APPLICATION_NAME, - ARG_IMAGE, agentTarballPath.toString(), ARG_TEMPLATE, APP_TEMPLATE3, ARG_RESOURCES, APP_RESOURCE ]) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy index a51c769..fcbfb3c 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy @@ -56,7 +56,6 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { SliderShell shell = slider(EXIT_SUCCESS, [ ACTION_CREATE, APPLICATION_NAME, - ARG_IMAGE, agentTarballPath.toString(), ARG_TEMPLATE, APP_TEMPLATE2, ARG_RESOURCES, APP_RESOURCE ]) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy index 00a876a..8930b8d 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy @@ -50,7 +50,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { SliderShell shell = slider(EXIT_SUCCESS, [ ACTION_CREATE, APPLICATION_NAME, - ARG_IMAGE, agentTarballPath.toString(), + //ARG_IMAGE, agentTarballPath.toString(), ARG_TEMPLATE, APP_TEMPLATE, ARG_RESOURCES, APP_RESOURCE ]) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0d41051a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy index f8caac5..c5dbecb 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy @@ -61,7 +61,6 @@ public class ClusterBuildDestroyIT extends AgentCommandTestBase [ ACTION_BUILD, CLUSTER, - ARG_IMAGE, agentTarballPath.toString(), ARG_ZKHOSTS, SLIDER_CONFIG.get(SliderXmlConfKeys.REGISTRY_ZK_QUORUM, DEFAULT_SLIDER_ZK_HOSTS), ARG_TEMPLATE, APP_TEMPLATE,
