Repository: ambari Updated Branches: refs/heads/trunk d1b777714 -> b5779fe6d
AMBARI-18897. HBase conf directory should not have a copy of core-site.xml and hdfs-site.xml.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5779fe6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5779fe6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5779fe6 Branch: refs/heads/trunk Commit: b5779fe6dca4db7df15abd905ef4b3dfae9d2c03 Parents: d1b7777 Author: Vitaly Brodetskyi <[email protected]> Authored: Wed Nov 16 09:07:53 2016 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Wed Nov 16 09:07:53 2016 +0200 ---------------------------------------------------------------------- .../libraries/functions/constants.py | 1 + .../HBASE/0.96.0.2.0/package/scripts/hbase.py | 46 ++++++++++---------- .../HDP/2.0.6/properties/stack_features.json | 5 +++ .../stacks/2.0.6/HBASE/test_hbase_client.py | 14 ------ .../stacks/2.0.6/HBASE/test_hbase_master.py | 21 --------- .../2.0.6/HBASE/test_hbase_regionserver.py | 28 ------------ .../2.0.6/HBASE/test_phoenix_queryserver.py | 16 ------- 7 files changed, 29 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b5779fe6/ambari-common/src/main/python/resource_management/libraries/functions/constants.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py index d1428d4..3431495 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py @@ -102,3 +102,4 @@ class StackFeature: ATLAS_HBASE_SETUP = "atlas_hbase_setup" RANGER_HIVE_PLUGIN_JDBC_URL = "ranger_hive_plugin_jdbc_url" ZKFC_VERSION_ADVERTISED = "zkfc_version_advertised" + PHOENIX_CORE_HDFS_SITE_REQUIRED = "phoenix_core_hdfs_site_required" http://git-wip-us.apache.org/repos/asf/ambari/blob/b5779fe6/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py index 6f56512..b3ae2b5 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py @@ -29,7 +29,8 @@ from resource_management.core.resources.service import ServiceConfig from resource_management.core.resources.system import Directory, Execute, File from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst - +from resource_management.libraries.functions.constants import StackFeature +from resource_management.libraries.functions.stack_features import check_stack_feature @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) def hbase(name=None): @@ -102,29 +103,28 @@ def hbase(name=None): group = params.user_group ) - XmlConfig( "core-site.xml", - conf_dir = params.hbase_conf_dir, - configurations = params.config['configurations']['core-site'], - configuration_attributes=params.config['configuration_attributes']['core-site'], - owner = params.hbase_user, - group = params.user_group - ) - - if 'hdfs-site' in params.config['configurations']: - XmlConfig( "hdfs-site.xml", - conf_dir = params.hbase_conf_dir, - configurations = params.config['configurations']['hdfs-site'], - configuration_attributes=params.config['configuration_attributes']['hdfs-site'], - owner = params.hbase_user, - group = params.user_group + if check_stack_feature(StackFeature.PHOENIX_CORE_HDFS_SITE_REQUIRED, params.version_for_stack_feature_checks): + XmlConfig( "core-site.xml", + conf_dir = params.hbase_conf_dir, + configurations = params.config['configurations']['core-site'], + configuration_attributes=params.config['configuration_attributes']['core-site'], + owner = params.hbase_user, + group = params.user_group ) - - XmlConfig("hdfs-site.xml", - conf_dir=params.hadoop_conf_dir, - configurations=params.config['configurations']['hdfs-site'], - configuration_attributes=params.config['configuration_attributes']['hdfs-site'], - owner=params.hdfs_user, - group=params.user_group + if 'hdfs-site' in params.config['configurations']: + XmlConfig( "hdfs-site.xml", + conf_dir = params.hbase_conf_dir, + configurations = params.config['configurations']['hdfs-site'], + configuration_attributes=params.config['configuration_attributes']['hdfs-site'], + owner = params.hbase_user, + group = params.user_group + ) + else: + File(format("{params.hbase_conf_dir}/hdfs-site.xml"), + action="delete" + ) + File(format("{params.hbase_conf_dir}/core-site.xml"), + action="delete" ) if 'hbase-policy' in params.config['configurations']: http://git-wip-us.apache.org/repos/asf/ambari/blob/b5779fe6/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json index 93e7bdf..dd87b72 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json @@ -313,6 +313,11 @@ "name": "zkfc_version_advertised", "description": "ZKFC advertise version", "min_version": "2.5.0.0" + }, + { + "name": "phoenix_core_hdfs_site_required", + "description": "HDFS and CORE site required for Phoenix", + "max_version": "2.5.9.9" } ] } http://git-wip-us.apache.org/repos/asf/ambari/blob/b5779fe6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py index cbc9066..2ac018a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py @@ -78,13 +78,6 @@ class TestHBaseClient(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/etc/hadoop/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] - ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', group = 'hadoop', @@ -174,13 +167,6 @@ class TestHBaseClient(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/etc/hadoop/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] - ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/b5779fe6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py index 5b77d3a..e57e235 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py @@ -333,13 +333,6 @@ class TestHBaseMaster(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/etc/hadoop/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] - ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', group = 'hadoop' @@ -471,13 +464,6 @@ class TestHBaseMaster(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/etc/hadoop/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] - ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', group = 'hadoop', @@ -620,13 +606,6 @@ class TestHBaseMaster(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/usr/hdp/current/hadoop-client/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) - self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/b5779fe6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py index a0e151f..b1c0042 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py @@ -170,13 +170,6 @@ class TestHbaseRegionServer(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/etc/hadoop/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] - ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', group = 'hadoop', @@ -266,13 +259,6 @@ class TestHbaseRegionServer(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/etc/hadoop/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site'] - ) self.assertResourceCalled('File', '/etc/hbase/conf/hbase-policy.xml', owner = 'hbase', group = 'hadoop', @@ -374,13 +360,6 @@ class TestHbaseRegionServer(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/usr/hdp/current/hadoop-client/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) - self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop', @@ -488,13 +467,6 @@ class TestHbaseRegionServer(RMFTestCase): configurations = self.getConfig()['configurations']['hdfs-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/usr/hdp/current/hadoop-client/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes']['hdfs-site']) - self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/b5779fe6/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py index e4f5b2f..db1ec82 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py @@ -273,14 +273,6 @@ class TestPhoenixQueryServer(RMFTestCase): configuration_attributes = self.getConfig()['configuration_attributes'][ 'hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/usr/hdp/current/hadoop-client/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ - 'hdfs-site'] - ) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop', @@ -384,14 +376,6 @@ class TestPhoenixQueryServer(RMFTestCase): configuration_attributes = self.getConfig()['configuration_attributes'][ 'hdfs-site'] ) - self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', - owner = 'hdfs', - group = 'hadoop', - conf_dir = '/usr/hdp/current/hadoop-client/conf', - configurations = self.getConfig()['configurations']['hdfs-site'], - configuration_attributes = self.getConfig()['configuration_attributes'][ - 'hdfs-site'] - ) self.assertResourceCalled('XmlConfig', 'hbase-policy.xml', owner = 'hbase', group = 'hadoop',
