Repository: ambari Updated Branches: refs/heads/branch-2.1 3131ad828 -> 25e531d37
AMBARI-11916. HBASE stopped after security enabling HDP-2.2.4. (Ted Yu, swagle via swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25e531d3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25e531d3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25e531d3 Branch: refs/heads/branch-2.1 Commit: 25e531d3744db85b1b9a4494ad0c767bd197bf2e Parents: 3131ad8 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Sun Jun 14 11:44:59 2015 -0700 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Sun Jun 14 11:50:25 2015 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.2/services/stack_advisor.py | 1 - .../stacks/HDP/2.3/services/stack_advisor.py | 1 + .../python/stacks/2.2/common/test_stack_advisor.py | 1 - .../python/stacks/2.3/common/test_stack_advisor.py | 16 +++++++++++++--- 4 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/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 9390dfd..2380f2e 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 @@ -456,7 +456,6 @@ class HDP22StackAdvisor(HDP21StackAdvisor): if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in services['configurations']['hbase-env']['properties']: if 'true' == services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower(): - putHbaseSiteProperty("hbase.rpc.controllerfactory.class", "org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory") putHbaseSiteProperty("hbase.regionserver.wal.codec", 'org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec') putHbaseSiteProperty("phoenix.functions.allowUserDefinedFunctions", 'true') else: http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py index 076c202..e97dcce 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py @@ -124,6 +124,7 @@ class HDP23StackAdvisor(HDP22StackAdvisor): if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in services['configurations']['hbase-env']['properties']: if 'true' == services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower(): + putHbaseSiteProperty("hbase.rpc.controllerfactory.class", "org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory") putHbaseSiteProperty("hbase.region.server.rpc.scheduler.factory.class", "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory") else: putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class', 'delete', 'true') http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/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 3c9844a..9e5a3c0 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 @@ -1801,7 +1801,6 @@ class TestHDP22StackAdvisor(TestCase): "hbase-site": { "properties": { "hbase.regionserver.wal.codec": "org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec", - "hbase.rpc.controllerfactory.class": "org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory", "phoenix.functions.allowUserDefinedFunctions": "true", "hbase.regionserver.global.memstore.size": "0.4", "hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint" http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/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 07e3258..614644f 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 @@ -77,7 +77,12 @@ class TestHDP23StackAdvisor(TestCase): "yarn.scheduler.minimum-allocation-mb": "256", "yarn.scheduler.maximum-allocation-mb": "2048", }, - } + }, + "hbase-env": { + "properties": { + "phoenix_sql_enabled" : "true" + }, + } } clusterData = { "totalAvailableRam": 2048, @@ -93,7 +98,11 @@ class TestHDP23StackAdvisor(TestCase): "hbase.regionserver.global.memstore.size": "0.4", "hfile.block.cache.size": "0.4", "hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint", - "hbase.bucketcache.ioengine": "offheap" + "hbase.rpc.controllerfactory.class": "org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory", + "hbase.region.server.rpc.scheduler.factory.class": "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory", + 'hbase.regionserver.wal.codec': 'org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec', + "hbase.bucketcache.ioengine": "offheap", + "phoenix.functions.allowUserDefinedFunctions": "true" }, "property_attributes": { "hbase.coprocessor.regionserver.classes": { @@ -107,8 +116,9 @@ class TestHDP23StackAdvisor(TestCase): "hbase-env": { "properties": { "hbase_master_heapsize": "114688", + "hbase_max_direct_memory_size": "94208", "hbase_regionserver_heapsize": "20480", - "hbase_max_direct_memory_size": "94208" + "phoenix_sql_enabled" : "true" } }, "yarn-site": {
