SLIDER-366. Cleanup application packages SLIDER-485. Slider should not set the default queue to value default. It should rely on YARN to pick the default queue
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0143c210 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0143c210 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0143c210 Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports Commit: 0143c210da401225ac257c26c10ce4c38529d889 Parents: fa0acf1 Author: Sumit Mohanty <[email protected]> Authored: Fri Oct 3 18:33:31 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Oct 3 18:33:35 2014 -0700 ---------------------------------------------------------------------- app-packages/app-pkg-template/appConfig-default.json | 2 +- app-packages/command-logger/slider-pkg/appConfig.json | 2 +- app-packages/hbase/appConfig-default.json | 2 +- app-packages/memcached/appConfig-default.json | 2 +- app-packages/storm/appConfig-default.json | 2 +- .../src/main/java/org/apache/slider/client/SliderClient.java | 5 ++++- .../main/java/org/apache/slider/common/SliderXmlConfKeys.java | 4 ++-- .../apache/slider/providers/agent/ComponentInstanceState.java | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/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 3908030..457e013 100644 --- a/app-packages/app-pkg-template/appConfig-default.json +++ b/app-packages/app-pkg-template/appConfig-default.json @@ -4,7 +4,7 @@ }, "global": { "application.def": "myapp-1.0.0.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", + "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", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/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 73bc7fa..c8bb237 100644 --- a/app-packages/command-logger/slider-pkg/appConfig.json +++ b/app-packages/command-logger/slider-pkg/appConfig.json @@ -4,7 +4,7 @@ }, "global": { "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", + "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", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/hbase/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json index c7952df..658d727 100644 --- a/app-packages/hbase/appConfig-default.json +++ b/app-packages/hbase/appConfig-default.json @@ -5,7 +5,7 @@ "global": { "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", + "java_home": "/usr/jdk64/jdk1.7.0_67", "system_configs": "core-site", "site.global.app_user": "yarn", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/memcached/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/memcached/appConfig-default.json b/app-packages/memcached/appConfig-default.json index 7b4aa97..b8b4bf1 100644 --- a/app-packages/memcached/appConfig-default.json +++ b/app-packages/memcached/appConfig-default.json @@ -4,7 +4,7 @@ }, "global": { "application.def": ".slider/package/MEMCACHED/jmemcached-1.0.0.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", + "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", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/app-packages/storm/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json index 2b0eea0..e01ceda 100644 --- a/app-packages/storm/appConfig-default.json +++ b/app-packages/storm/appConfig-default.json @@ -4,7 +4,7 @@ }, "global": { "application.def": ".slider/package/STORM/slider-storm-app-package-${pkg.version}.zip", - "java_home": "/usr/jdk64/jdk1.7.0_45", + "java_home": "/usr/jdk64/jdk1.7.0_67", "create.default.zookeeper.node": "true", "system_configs": "core-site", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/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 dc81f98..e9333db 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 @@ -1285,7 +1285,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe amQueue = suppliedQueue; log.info("Using queue {} for the application instance.", amQueue); } - amLauncher.setQueue(amQueue); + + if (amQueue != null) { + amLauncher.setQueue(amQueue); + } // Submit the application to the applications manager // SubmitApplicationResponse submitResp = applicationsManager.submitApplication(appRequest); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java index 1bbe9ae..243dd95 100644 --- a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java +++ b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java @@ -84,10 +84,10 @@ public interface SliderXmlConfKeys { String KEY_AM_RESTART_LIMIT = "slider.yarn.restart.limit"; /** - * queue name + * queue name, by default let YARN pick the queue */ String KEY_YARN_QUEUE = "slider.yarn.queue"; - String DEFAULT_YARN_QUEUE = YarnConfiguration.DEFAULT_QUEUE_NAME; + String DEFAULT_YARN_QUEUE = null; /** * default priority http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0143c210/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java index f7f8bf4..8f7d0f7 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentInstanceState.java @@ -30,7 +30,7 @@ public class ComponentInstanceState { LoggerFactory.getLogger(ComponentInstanceState.class); private static int MAX_FAILURE_TOLERATED = 3; private static String INVALID_TRANSITION_ERROR = - "Result {0} for command {1} is not expected for component {2} in state {3}."; + "Result %s for command %s is not expected for component %s in state %s."; private final String componentName; private final ContainerId containerId;
