You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/03/11 11:47:43 UTC

[1/2] ambari git commit: AMBARI-15355. After EU from 2.2 -> 2.3 HBase region server started failed with memory error. Additional fix (dlysnichenko)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 bfb91e8d8 -> 13b5f2d20
  refs/heads/trunk 171379abd -> 5839ecbaa


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/13b5f2d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13b5f2d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/13b5f2d2

Branch: refs/heads/branch-2.2
Commit: 13b5f2d20814e51bb7927cfda1ef87b0ef652ddc
Parents: bfb91e8
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Mar 11 12:45:47 2016 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Mar 11 12:45:47 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/13b5f2d2/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 2518528..5e23b8a 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
@@ -603,9 +603,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 = regionserver_max_direct_memory_size / 2
+      reserved_offheap_memory = 2048
       bucketcache_offheap_memory = regionserver_max_direct_memory_size - reserved_offheap_memory
-      hbase_bucketcache_size = min(block_cache_heap + bucketcache_offheap_memory, regionserver_max_direct_memory_size - 1024)
+      hbase_bucketcache_size = bucketcache_offheap_memory
       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/13b5f2d2/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 11818ba..3858d42 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.8519",
+          "hbase.bucketcache.percentage.in.combinedcache": "1.0000",
           "hbase.regionserver.global.memstore.size": "0.4",
           "hfile.block.cache.size": "0.4",
           "hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint",


[2/2] ambari git commit: AMBARI-15355. After EU from 2.2 -> 2.3 HBase region server started failed with memory error. Additional fix (dlysnichenko)

Posted by dm...@apache.org.
AMBARI-15355. After EU from 2.2 -> 2.3 HBase region server started failed with memory error. Additional fix (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5839ecba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5839ecba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5839ecba

Branch: refs/heads/trunk
Commit: 5839ecbaa9efc8e11f01fc728eae57e7bb4856cb
Parents: 171379a
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Mar 11 12:45:47 2016 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Mar 11 12:47:12 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/5839ecba/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 31acba2..5f056be 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
@@ -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 = regionserver_max_direct_memory_size / 2
+      reserved_offheap_memory = 2048
       bucketcache_offheap_memory = regionserver_max_direct_memory_size - reserved_offheap_memory
-      hbase_bucketcache_size = min(block_cache_heap + bucketcache_offheap_memory, regionserver_max_direct_memory_size - 1024)
+      hbase_bucketcache_size = bucketcache_offheap_memory
       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/5839ecba/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 d6d4518..1af32d1 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
@@ -834,7 +834,7 @@ class TestHDP23StackAdvisor(TestCase):
       "hbase-site": {
         "properties": {
           "hbase.bucketcache.size": "92160",
-          "hbase.bucketcache.percentage.in.combinedcache": "0.8519",
+          "hbase.bucketcache.percentage.in.combinedcache": "1.0000",
           "hbase.regionserver.global.memstore.size": "0.4",
           "hfile.block.cache.size": "0.4",
           "hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint",