Repository: ambari Updated Branches: refs/heads/trunk e733b72dd -> 544c74e72
AMBARI-11281. Enable Phoenix UDFs by default (Ted Yu via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/544c74e7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/544c74e7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/544c74e7 Branch: refs/heads/trunk Commit: 544c74e72dd3d4be0fa30812d53a18989ad9650e Parents: e733b72 Author: Srimanth Gunturi <[email protected]> Authored: Wed May 20 17:15:37 2015 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Wed May 20 17:15:37 2015 -0700 ---------------------------------------------------------------------- .../HDP/2.2/services/HBASE/configuration/hbase-site.xml | 10 ++++++++++ .../resources/stacks/HDP/2.2/services/stack_advisor.py | 2 ++ .../test/python/stacks/2.2/common/test_stack_advisor.py | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/544c74e7/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml index 85e3557..f1bee10 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml @@ -138,6 +138,16 @@ </depends-on> </property> <property> + <name>phoenix.functions.allowUserDefinedFunctions</name> + <value> </value> + <depends-on> + <property> + <type>hbase-env</type> + <name>phoenix_sql_enabled</name> + </property> + </depends-on> + </property> + <property> <name>hbase.coprocessor.regionserver.classes</name> <value></value> <depends-on> http://git-wip-us.apache.org/repos/asf/ambari/blob/544c74e7/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 224c0b2..4e84a75 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 @@ -438,10 +438,12 @@ class HDP22StackAdvisor(HDP21StackAdvisor): putHbaseSiteProperty("hbase.region.server.rpc.scheduler.factory.class", "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory") 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: putHbaseSiteProperty("hbase.regionserver.wal.codec", 'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec') putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class', 'delete', 'true') putHbaseSitePropertyAttributes('hbase.rpc.controllerfactory.class', 'delete', 'true') + putHbaseSitePropertyAttributes('phoenix.functions.allowUserDefinedFunctions', 'delete', 'true') servicesList = [service["StackServices"]["service_name"] for service in services["services"]] if 'ranger-hbase-plugin-properties' in services['configurations'] and ('ranger-hbase-plugin-enabled' in services['configurations']['ranger-hbase-plugin-properties']['properties']): http://git-wip-us.apache.org/repos/asf/ambari/blob/544c74e7/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 5b6d7b1..834510e 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 @@ -1771,6 +1771,7 @@ class TestHDP22StackAdvisor(TestCase): "hbase.regionserver.wal.codec": "org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec", "hbase.region.server.rpc.scheduler.factory.class": "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory", "hbase.rpc.controllerfactory.class": "org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory", + "phoenix.functions.allowUserDefinedFunctions": "true", "hbase.bucketcache.size": "", "hbase.bucketcache.percentage.in.combinedcache": "", "hbase.regionserver.global.memstore.size": "0.4", @@ -1801,7 +1802,7 @@ class TestHDP22StackAdvisor(TestCase): # Test when phoenix_sql_enabled = false services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'] = 'false' expected['hbase-site']['properties']['hbase.regionserver.wal.codec'] = 'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec' - expected['hbase-site']['property_attributes'] = {'hbase.region.server.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}, 'hbase.coprocessor.regionserver.classes': {'delete': 'true'}} + expected['hbase-site']['property_attributes'] = {'hbase.region.server.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}, 'hbase.coprocessor.regionserver.classes': {'delete': 'true'}, 'phoenix.functions.allowUserDefinedFunctions': {'delete': 'true'}} self.stackAdvisor.recommendHBASEConfigurations(configurations, clusterData, services, None) self.assertEquals(configurations, expected) @@ -1833,7 +1834,7 @@ class TestHDP22StackAdvisor(TestCase): }]}) services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'] = 'false' expected['hbase-site']['properties']['hbase.regionserver.wal.codec'] = 'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec' - expected['hbase-site']['property_attributes'] = {'hbase.region.server.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}, 'hbase.coprocessor.regionserver.classes': {'delete': 'true'}} + expected['hbase-site']['property_attributes'] = {'hbase.region.server.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}, 'hbase.coprocessor.regionserver.classes': {'delete': 'true'}, 'phoenix.functions.allowUserDefinedFunctions': {'delete': 'true'}} expected['hbase-env']['property_attributes'] = {'hbase_master_heapsize': {'maximum': '49152'}} self.stackAdvisor.recommendHBASEConfigurations(configurations, clusterData, services, hosts) self.assertEquals(configurations, expected)
