You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/11/04 00:09:46 UTC
git commit: Storm app package changes to fix the jmx property names
and default yarn.memory values
Repository: incubator-slider
Updated Branches:
refs/heads/develop 6218b2d0e -> 0b61c4575
Storm app package changes to fix the jmx property names and default yarn.memory values
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0b61c457
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0b61c457
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0b61c457
Branch: refs/heads/develop
Commit: 0b61c45754d1b0fb53628bf3451a28a28d3a31a0
Parents: 6218b2d
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Nov 3 15:09:08 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Nov 3 15:09:08 2014 -0800
----------------------------------------------------------------------
app-packages/hbase-win/appConfig-default.json | 2 --
app-packages/storm/jmx_metrics.json | 8 ++++----
app-packages/storm/resources-default.json | 13 +++++++++----
3 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b61c457/app-packages/hbase-win/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json
index 80d20af..04cb9a9 100644
--- a/app-packages/hbase-win/appConfig-default.json
+++ b/app-packages/hbase-win/appConfig-default.json
@@ -10,9 +10,7 @@
"site.global.app_user": "hadoop",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
"site.global.hbase_instance_name": "instancename",
- "site.global.hbase_root_password": "secret",
"site.global.user_group": "hadoop",
- "site.global.monitor_protocol": "http",
"site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;",
"site.global.java_library_path": "c:\\hdp\\hadoop\\bin",
"site.global.hbase_rest_port": "17000",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b61c457/app-packages/storm/jmx_metrics.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/jmx_metrics.json b/app-packages/storm/jmx_metrics.json
index f7d4e60..b0816b1 100644
--- a/app-packages/storm/jmx_metrics.json
+++ b/app-packages/storm/jmx_metrics.json
@@ -2,17 +2,17 @@
"Component": {
"NIMBUS": {
"FreeSlots": {
- "metric": "$['slots.free']",
+ "metric": "$['slotsFree']",
"pointInTime": true,
"temporal": false
},
"Tasks": {
- "metric": "$['tasks.total']",
+ "metric": "$['tasksTotal']",
"pointInTime": true,
"temporal": false
},
"Executors": {
- "metric": "$['executors.total']",
+ "metric": "$['executorsTotal']",
"pointInTime": true,
"temporal": false
},
@@ -22,7 +22,7 @@
"temporal": false
},
"NimbusUptime": {
- "metric": "$['nimbus.uptime']",
+ "metric": "$['nimbusUptime']",
"pointInTime": true,
"temporal": false
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0b61c457/app-packages/storm/resources-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/resources-default.json b/app-packages/storm/resources-default.json
index a36f005..65e6579 100644
--- a/app-packages/storm/resources-default.json
+++ b/app-packages/storm/resources-default.json
@@ -8,22 +8,27 @@
},
"components": {
"slider-appmaster": {
+ "yarn.memory": "512"
},
"NIMBUS": {
"yarn.role.priority": "1",
- "yarn.component.instances": "1"
+ "yarn.component.instances": "1",
+ "yarn.memory": "2048"
},
"STORM_UI_SERVER": {
"yarn.role.priority": "2",
- "yarn.component.instances": "1"
+ "yarn.component.instances": "1",
+ "yarn.memory": "1278"
},
"DRPC_SERVER": {
"yarn.role.priority": "3",
- "yarn.component.instances": "1"
+ "yarn.component.instances": "1",
+ "yarn.memory": "1278"
},
"SUPERVISOR": {
"yarn.role.priority": "4",
- "yarn.component.instances": "1"
+ "yarn.component.instances": "1",
+ "yarn.memory": "3072"
}
}
}