Преглед на файлове

AMBARI-15355. After EU from 2.2 -> 2.3 HBase region server started failed with memory error (dlysnichenko)

Lisnichenko Dmitro преди 9 години
родител
ревизия
28430f37cd

+ 2 - 2
ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py

@@ -609,9 +609,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)
 

+ 1 - 1
ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py

@@ -834,7 +834,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",