ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject ambari git commit: AMBARI-11798. PhoenixRpcSchedulerFactory should be set for HDP 2.3 stack (Ted Yu via srimanth)
Date Mon, 08 Jun 2015 23:45:21 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 e1862e9b5 -> 6301496e9


AMBARI-11798. PhoenixRpcSchedulerFactory should be set for HDP 2.3 stack (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/6301496e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6301496e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6301496e

Branch: refs/heads/branch-2.1
Commit: 6301496e91f46749201cab29a01340835c9d12e4
Parents: e1862e9
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Mon Jun 8 16:44:35 2015 -0700
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Mon Jun 8 16:44:40 2015 -0700

----------------------------------------------------------------------
 .../main/resources/stacks/HDP/2.2/services/stack_advisor.py    | 2 --
 .../main/resources/stacks/HDP/2.3/services/stack_advisor.py    | 6 ++++++
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py    | 3 ---
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6301496e/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 50ba3b7..9390dfd 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,13 +456,11 @@ 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.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')
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6301496e/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 327d918..e65736e 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
@@ -86,6 +86,12 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 
       putHbaseEnvPropertyAttributes('hbase_max_direct_memory_size', 'delete', 'true')
 
+    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.region.server.rpc.scheduler.factory.class", "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory")
+      else:
+        putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
'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']):
       rangerPluginEnabled = services['configurations']['ranger-hbase-plugin-properties']['properties']['ranger-hbase-plugin-enabled']

http://git-wip-us.apache.org/repos/asf/ambari/blob/6301496e/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 d021f62..3c9844a 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.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.regionserver.global.memstore.size": "0.4",
@@ -1848,7 +1847,6 @@ 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'}
     expected['hbase-site']['property_attributes']['hbase.rpc.controllerfactory.class'] =
{'delete': 'true'}
     expected['hbase-site']['property_attributes']['hbase.coprocessor.regionserver.classes']
= {'delete': 'true'}
     expected['hbase-site']['property_attributes']['phoenix.functions.allowUserDefinedFunctions']
= {'delete': 'true'}
@@ -1883,7 +1881,6 @@ 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'}
     expected['hbase-site']['property_attributes']['hbase.rpc.controllerfactory.class'] =
{'delete': 'true'}
     expected['hbase-site']['property_attributes']['hbase.coprocessor.regionserver.classes']
= {'delete': 'true'}
     expected['hbase-site']['property_attributes']['phoenix.functions.allowUserDefinedFunctions']
= {'delete': 'true'}


Mime
View raw message