Repository: incubator-slider Updated Branches: refs/heads/develop 89f08e354 -> 7e667fc52
SLIDER-595 Default app master container size should be 1024m Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7e667fc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7e667fc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7e667fc5 Branch: refs/heads/develop Commit: 7e667fc52d467afb0b9792fa4a6be6ea78b34a92 Parents: 89f08e3 Author: Steve Loughran <[email protected]> Authored: Mon Nov 3 14:33:05 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Nov 3 14:33:05 2014 +0000 ---------------------------------------------------------------------- app-packages/hbase-win/resources-default.json | 2 +- .../org/apache/slider/providers/slideram/instance/resources.json | 2 +- .../src/test/app_packages/test_command_log/resources.json | 4 +++- .../test/app_packages/test_command_log/resources_no_role.json | 2 ++ .../app_packages/test_command_log/resources_queue_labels.json | 4 +++- 5 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7e667fc5/app-packages/hbase-win/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/resources-default.json b/app-packages/hbase-win/resources-default.json index 91cd640..e451c51 100644 --- a/app-packages/hbase-win/resources-default.json +++ b/app-packages/hbase-win/resources-default.json @@ -13,7 +13,7 @@ "yarn.memory": "256" }, "slider-appmaster": { - "yarn.memory": "256" + "yarn.memory": "1024" }, "HBASE_REGIONSERVER": { "yarn.role.priority": "2", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7e667fc5/slider-core/src/main/resources/org/apache/slider/providers/slideram/instance/resources.json ---------------------------------------------------------------------- diff --git a/slider-core/src/main/resources/org/apache/slider/providers/slideram/instance/resources.json b/slider-core/src/main/resources/org/apache/slider/providers/slideram/instance/resources.json index 5ed462b..478ab7e 100644 --- a/slider-core/src/main/resources/org/apache/slider/providers/slideram/instance/resources.json +++ b/slider-core/src/main/resources/org/apache/slider/providers/slideram/instance/resources.json @@ -12,7 +12,7 @@ "slider-appmaster": { "yarn.component.instances": "1", "yarn.vcores": "1", - "yarn.memory": "256" + "yarn.memory": "1024" } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7e667fc5/slider-core/src/test/app_packages/test_command_log/resources.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_command_log/resources.json b/slider-core/src/test/app_packages/test_command_log/resources.json index 8345661..18c505f 100644 --- a/slider-core/src/test/app_packages/test_command_log/resources.json +++ b/slider-core/src/test/app_packages/test_command_log/resources.json @@ -6,10 +6,12 @@ }, "components": { "COMMAND_LOGGER": { - "yarn.role.priority": "1", + "yarn.memory": "128", + "yarn.role.priority": "1", "yarn.component.instances": "1" }, "slider-appmaster": { + "yarn.memory": "256" } } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7e667fc5/slider-core/src/test/app_packages/test_command_log/resources_no_role.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_command_log/resources_no_role.json b/slider-core/src/test/app_packages/test_command_log/resources_no_role.json index 7913fe2..b25c8c2 100644 --- a/slider-core/src/test/app_packages/test_command_log/resources_no_role.json +++ b/slider-core/src/test/app_packages/test_command_log/resources_no_role.json @@ -6,10 +6,12 @@ }, "components": { "COMMAND_LOGGER": { + "yarn.memory": "128", "yarn.role.priority": "1", "yarn.component.instances": "0" }, "slider-appmaster": { + "yarn.memory": "256" } } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7e667fc5/slider-core/src/test/app_packages/test_command_log/resources_queue_labels.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/app_packages/test_command_log/resources_queue_labels.json b/slider-core/src/test/app_packages/test_command_log/resources_queue_labels.json index d121608..1357f9f 100644 --- a/slider-core/src/test/app_packages/test_command_log/resources_queue_labels.json +++ b/slider-core/src/test/app_packages/test_command_log/resources_queue_labels.json @@ -6,12 +6,14 @@ }, "components": { "COMMAND_LOGGER": { + "yarn.memory": "128", "yarn.role.priority": "1", "yarn.component.instances": "1", "yarn.label.expression":"blue" }, "slider-appmaster": { - "yarn.label.expression":"red" + "yarn.label.expression":"red", + "yarn.memory": "256" } } }
