Repository: ambari Updated Branches: refs/heads/trunk a9c47820e -> be9066f6d
AMBARI-10967. Rpc scheduler factory class config parameter is misspelled (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/be9066f6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be9066f6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be9066f6 Branch: refs/heads/trunk Commit: be9066f6dd046eee1dd9efd6960901d147e2ccbb Parents: a9c4782 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Wed May 6 11:39:45 2015 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Wed May 6 11:39:45 2015 -0700 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.2/services/stack_advisor.py | 4 ++-- .../src/test/python/stacks/2.2/common/test_stack_advisor.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/be9066f6/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 fd3da2e..53f278b 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 @@ -426,12 +426,12 @@ 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.regionserver.rpc.scheduler.factory.class", "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory") + 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') else: putHbaseSiteProperty("hbase.regionserver.wal.codec", 'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec') - putHbaseSitePropertyAttributes('hbase.regionserver.rpc.scheduler.factory.class', 'delete', 'true') + putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class', 'delete', 'true') putHbaseSitePropertyAttributes('hbase.rpc.controllerfactory.class', 'delete', 'true') servicesList = [service["StackServices"]["service_name"] for service in services["services"]] http://git-wip-us.apache.org/repos/asf/ambari/blob/be9066f6/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 fa55a4f..46edea4 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 @@ -1432,7 +1432,7 @@ class TestHDP22StackAdvisor(TestCase): "hbase-site": { "properties": { "hbase.regionserver.wal.codec": "org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec", - "hbase.regionserver.rpc.scheduler.factory.class": "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory", + "hbase.region.server.rpc.scheduler.factory.class": "org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory", "hbase.rpc.controllerfactory.class": "org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory", "hbase.bucketcache.size": "", "hbase.bucketcache.percentage.in.combinedcache": "", @@ -1459,7 +1459,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.regionserver.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}} + expected['hbase-site']['property_attributes'] = {'hbase.region.server.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}} self.stackAdvisor.recommendHBASEConfigurations(configurations, clusterData, services, None) self.assertEquals(configurations, expected) @@ -1491,7 +1491,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.regionserver.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}} + expected['hbase-site']['property_attributes'] = {'hbase.region.server.rpc.scheduler.factory.class': {'delete': 'true'}, 'hbase.rpc.controllerfactory.class': {'delete': 'true'}} expected['hbase-env']['property_attributes'] = {'hbase_master_heapsize': {'maximum': '49152'}} self.stackAdvisor.recommendHBASEConfigurations(configurations, clusterData, services, hosts) self.assertEquals(configurations, expected)
