You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/02/16 19:30:31 UTC
[26/50] [abbrv] ambari git commit: AMBARI-15030 : Fix unreasonable
default heap settings for AMS HBase heapsize and xmn size (avijayan)
AMBARI-15030 : Fix unreasonable default heap settings for AMS HBase heapsize and xmn size (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aac5389f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aac5389f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aac5389f
Branch: refs/heads/branch-dev-patch-upgrade
Commit: aac5389fea7867141a3f4f421b2bc0d1e61117f3
Parents: f7055ae
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Fri Feb 12 10:24:44 2016 -0800
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Fri Feb 12 10:49:22 2016 -0800
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml | 6 +++---
.../main/resources/stacks/HDP/2.0.6/services/stack_advisor.py | 2 ++
.../src/test/python/stacks/2.2/common/test_stack_advisor.py | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aac5389f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index 191e8b2..90e1307 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -47,7 +47,7 @@
</property>
<property>
<name>hbase_regionserver_heapsize</name>
- <value>512</value>
+ <value>756</value>
<description>
HBase RegionServer Heap Size. In embedded mode, total heap size is
sum of master and regionserver heap sizes.
@@ -69,7 +69,7 @@
</property>
<property>
<name>regionserver_xmn_size</name>
- <value>256</value>
+ <value>128</value>
<description>HBase RegionServer maximum value for young generation heap size.</description>
<value-attributes>
<type>int</type>
@@ -84,7 +84,7 @@
</property>
<property>
<name>hbase_master_xmn_size</name>
- <value>256</value>
+ <value>102</value>
<description>
HBase Master maximum value for young generation heap size.
</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/aac5389f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index af21008..7c69ac9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -595,6 +595,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
# Distributed mode heap size
if operatingMode == "distributed":
+ hbase_heapsize = max(hbase_heapsize, 756)
putHbaseEnvProperty("hbase_master_heapsize", "512")
putHbaseEnvProperty("hbase_master_xmn_size", "102") #20% of 512 heap size
putHbaseEnvProperty("hbase_regionserver_heapsize", hbase_heapsize)
@@ -602,6 +603,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
else:
# Embedded mode heap size : master + regionserver
hbase_rs_heapsize = 512
+ putHbaseEnvProperty("hbase_regionserver_heapsize", hbase_rs_heapsize)
putHbaseEnvProperty("hbase_master_heapsize", hbase_heapsize)
putHbaseEnvProperty("hbase_master_xmn_size", round_to_n(0.15*(hbase_heapsize+hbase_rs_heapsize),64))
http://git-wip-us.apache.org/repos/asf/ambari/blob/aac5389f/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index d2497fd..14a28d3 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2025,7 +2025,8 @@ class TestHDP22StackAdvisor(TestCase):
"ams-hbase-env": {
"properties": {
"hbase_master_xmn_size": "128",
- "hbase_master_heapsize": "512"
+ "hbase_master_heapsize": "512",
+ "hbase_regionserver_heapsize": "512"
}
},
"ams-env": {