Repository: incubator-slider Updated Branches: refs/heads/develop db0fb5795 -> 7506d930a
SLIDER-569. Remove unnecessary parameters from app packages Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7506d930 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7506d930 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7506d930 Branch: refs/heads/develop Commit: 7506d930a542651ffe32ece9d8dd4caf2bf7857a Parents: db0fb57 Author: Sumit Mohanty <[email protected]> Authored: Mon Oct 27 09:44:26 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Oct 27 09:44:26 2014 -0700 ---------------------------------------------------------------------- app-packages/app-pkg-template/appConfig-default.json | 1 - app-packages/command-logger/slider-pkg/appConfig.json | 5 +---- app-packages/command-logger/slider-pkg/package/scripts/cl.py | 1 - .../command-logger/slider-pkg/package/scripts/params.py | 1 - app-packages/memcached-win/appConfig-default.json | 3 --- app-packages/memcached/appConfig-default.json | 4 ---- app-packages/memcached/package/scripts/params.py | 1 - .../apache/slider/providers/agent/AgentProviderService.java | 8 ++++++++ .../src/test/app_packages/test_command_log/appConfig.json | 7 ++----- .../app_packages/test_command_log/appConfig_fast_no_reg.json | 8 ++------ .../test/app_packages/test_command_log/appConfig_no_hb.json | 7 ++----- .../slider/providers/agent/TestAgentProviderService.java | 4 ++++ 12 files changed, 19 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/app-packages/app-pkg-template/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/app-pkg-template/appConfig-default.json b/app-packages/app-pkg-template/appConfig-default.json index 457e013..cc65503 100644 --- a/app-packages/app-pkg-template/appConfig-default.json +++ b/app-packages/app-pkg-template/appConfig-default.json @@ -6,7 +6,6 @@ "application.def": "myapp-1.0.0.zip", "java_home": "/usr/jdk64/jdk1.7.0_67", - "site.global.app_user": "yarn", "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/myapp-1.0.0", "site.global.listen_port": "${MYAPP_COMPONENT.ALLOCATED_PORT}" http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/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 9c19670..d4082a8 100644 --- a/app-packages/command-logger/slider-pkg/appConfig.json +++ b/app-packages/command-logger/slider-pkg/appConfig.json @@ -5,12 +5,9 @@ "global": { "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", "java_home": "/usr/jdk64/jdk1.7.0_67", - "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", "site.cl-site.pattern.for.test.to.verify": "verify this pattern" http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/app-packages/command-logger/slider-pkg/package/scripts/cl.py ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/package/scripts/cl.py b/app-packages/command-logger/slider-pkg/package/scripts/cl.py index 6b18faa..b15bbfd 100644 --- a/app-packages/command-logger/slider-pkg/package/scripts/cl.py +++ b/app-packages/command-logger/slider-pkg/package/scripts/cl.py @@ -81,7 +81,6 @@ class CommandLogger(Script): file_location = params.file_location TemplateConfig( file_location, - owner = params.app_user, template_tag = None ) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/app-packages/command-logger/slider-pkg/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/package/scripts/params.py b/app-packages/command-logger/slider-pkg/package/scripts/params.py index 3d388ae..b135539 100644 --- a/app-packages/command-logger/slider-pkg/package/scripts/params.py +++ b/app-packages/command-logger/slider-pkg/package/scripts/params.py @@ -25,7 +25,6 @@ config = Script.get_config() container_id = config['hostLevelParams']['container_id'] application_id = config['configurations']['global']['application_id'] -app_user = config['configurations']['global']['app_user'] datetime_format = config['configurations']['cl-site']['datetime.format'] file_location = config['configurations']['cl-site']['logfile.location'] http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/app-packages/memcached-win/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached-win/appConfig-default.json b/app-packages/memcached-win/appConfig-default.json index 059c712..8a5ffd0 100644 --- a/app-packages/memcached-win/appConfig-default.json +++ b/app-packages/memcached-win/appConfig-default.json @@ -6,9 +6,6 @@ "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", "java_home": "C:\\java", - "site.global.app_user": "hadoop", - "site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid", - "site.global.app_root": "${AGENT_WORK_ROOT}\\app\\install", "site.global.additional_cp": "C:\\hdp\\hadoop-2.4.0.2.1.3.0-1990\\share\\hadoop\\common\\lib\\*", "site.global.xmx_val": "256m", "site.global.xms_val": "128m", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/app-packages/memcached/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached/appConfig-default.json b/app-packages/memcached/appConfig-default.json index b8b4bf1..16dd931 100644 --- a/app-packages/memcached/appConfig-default.json +++ b/app-packages/memcached/appConfig-default.json @@ -6,10 +6,6 @@ "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", "java_home": "/usr/jdk64/jdk1.7.0_67", - "site.global.app_user": "yarn", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/jmemcached-1.0.0", - "site.global.pid_file": "${AGENT_WORK_ROOT}/app/run/component.pid", - "site.global.additional_cp": "/usr/lib/hadoop/lib/*", "site.global.xmx_val": "256m", "site.global.xms_val": "128m", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/app-packages/memcached/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/memcached/package/scripts/params.py b/app-packages/memcached/package/scripts/params.py index 25b4055..056a3b9 100644 --- a/app-packages/memcached/package/scripts/params.py +++ b/app-packages/memcached/package/scripts/params.py @@ -25,7 +25,6 @@ config = Script.get_config() app_root = config['configurations']['global']['app_root'] java64_home = config['hostLevelParams']['java_home'] -app_user = config['configurations']['global']['app_user'] pid_file = config['configurations']['global']['pid_file'] additional_cp = config['configurations']['global']['additional_cp'] http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index 6bff748..934e5f0 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -1934,6 +1934,14 @@ public class AgentProviderService extends AbstractProviderService implements config.put("app_input_conf_dir", "${AGENT_WORK_ROOT}/" + SliderKeys.PROPAGATED_CONF_DIR_NAME); config.put("app_container_id", containerId); config.put("app_container_tag", tags.getTag(roleName, containerId)); + + // add optional parameters only if they are not already provided + if(!config.containsKey("pid_file")) { + config.put("pid_file", "${AGENT_WORK_ROOT}/app/run/component.pid"); + } + if(!config.containsKey("app_root")) { + config.put("app_root", "${AGENT_WORK_ROOT}/app/install"); + } } private void buildRoleHostDetails(Map<String, String> details) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/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 a3a9ccf..a8d3d4b 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 @@ -4,13 +4,10 @@ }, "global": { "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "site.global.app_user": "yarn", + "java_home": "/usr/jdk64/jdk1.7.0_67", "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.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log", + "site.cl-site.logfile.location": "${AGENT_LOG_ROOT}/operations.log", "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p", "site.cl-site.pattern.for.test.to.verify": "verify this pattern" }, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/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 76858e7..ac11c08 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 @@ -6,14 +6,10 @@ "heartbeat.monitor.interval": "20000", "agent.instance.debug.data": "ANY:DO_NOT_REGISTER:NONE", "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "site.global.app_user": "yarn", + "java_home": "/usr/jdk64/jdk1.7.0_67", "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.logfile.location": "${AGENT_LOG_ROOT}/operations.log", "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p" }, "components": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/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 49ec4b7..9d70879 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 @@ -6,13 +6,10 @@ "heartbeat.monitor.interval": "20000", "agent.instance.debug.data": "ANY:DO_NOT_HEARTBEAT:DO_NOT_HEARTBEAT:NONE", "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "site.global.app_user": "yarn", + "java_home": "/usr/jdk64/jdk1.7.0_67", "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.cl-site.logfile.location": "${AGENT_LOG_ROOT}/app/log/operations.log", + "site.cl-site.logfile.location": "${AGENT_LOG_ROOT}/operations.log", "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p" }, "components": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7506d930/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java ---------------------------------------------------------------------- diff --git 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 index c199a54..2c977f4 100644 --- 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 @@ -1447,6 +1447,8 @@ public class TestAgentProviderService { Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_install_dir")); Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_input_conf_dir")); Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_container_id")); + Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("pid_file")); + Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_root")); } @Test @@ -1529,6 +1531,8 @@ public class TestAgentProviderService { Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_install_dir")); Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_input_conf_dir")); Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_container_id")); + Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("pid_file")); + Assert.assertTrue(cmd.getConfigurations().get("global").containsKey("app_root")); Assert.assertTrue(cmd.getConfigurations().get("hbase-site").containsKey("defaultA")); Assert.assertFalse(cmd.getConfigurations().get("hbase-site").containsKey("defaultB")); }
