Repository: ambari Updated Branches: refs/heads/branch-2.2 dc5ddfc71 -> 4051f690b refs/heads/trunk 456b45118 -> 28430f37c
AMBARI-15355. After EU from 2.2 -> 2.3 HBase region server started failed with memory error (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4051f690 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4051f690 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4051f690 Branch: refs/heads/branch-2.2 Commit: 4051f690b919c8940c7e66bed4e59dc7854039ab Parents: dc5ddfc Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Wed Mar 9 20:49:57 2016 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Wed Mar 9 20:49:57 2016 +0200 ---------------------------------------------------------------------- .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py | 4 ++-- .../src/test/python/stacks/2.3/common/test_stack_advisor.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4051f690/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py index f88eb0c..43a9190 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py @@ -601,9 +601,9 @@ class HDP22StackAdvisor(HDP21StackAdvisor): hfile_block_cache_size = '0.4' block_cache_heap = 8192 # int(regionserver_heap_size * hfile_block_cache_size) hbase_regionserver_global_memstore_size = '0.4' - reserved_offheap_memory = 2048 + reserved_offheap_memory = regionserver_max_direct_memory_size / 2 bucketcache_offheap_memory = regionserver_max_direct_memory_size - reserved_offheap_memory - hbase_bucketcache_size = block_cache_heap + bucketcache_offheap_memory + hbase_bucketcache_size = min(block_cache_heap + bucketcache_offheap_memory, regionserver_max_direct_memory_size - 1024) hbase_bucketcache_percentage_in_combinedcache = float(bucketcache_offheap_memory) / hbase_bucketcache_size hbase_bucketcache_percentage_in_combinedcache_str = "{0:.4f}".format(math.ceil(hbase_bucketcache_percentage_in_combinedcache * 10000) / 10000.0) http://git-wip-us.apache.org/repos/asf/ambari/blob/4051f690/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py index 41666ec..11818ba 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py @@ -822,7 +822,7 @@ class TestHDP23StackAdvisor(TestCase): "hbase-site": { "properties": { "hbase.bucketcache.size": "92160", - "hbase.bucketcache.percentage.in.combinedcache": "0.9184", + "hbase.bucketcache.percentage.in.combinedcache": "0.8519", "hbase.regionserver.global.memstore.size": "0.4", "hfile.block.cache.size": "0.4", "hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint",
