Repository: ambari Updated Branches: refs/heads/trunk 5e64d87f6 -> acbe6f108
AMBARI-9802. Phoenix is failing on ambari-installed secure clusters. (Rob Levas via mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acbe6f10 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acbe6f10 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acbe6f10 Branch: refs/heads/trunk Commit: acbe6f10832af0f3fcc95c524c968a17b9efc3e5 Parents: 5e64d87 Author: Mahadev Konar <maha...@apache.org> Authored: Thu Feb 26 10:44:14 2015 -0800 Committer: Mahadev Konar <maha...@apache.org> Committed: Thu Feb 26 10:44:14 2015 -0800 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/package/scripts/hbase.py | 8 +++++++ .../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 | 22 +++++++++++++++++++- 4 files changed, 63 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/acbe6f10/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 6f18ddf..06e0481 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 @@ -65,6 +65,14 @@ def hbase(name=None # 'master' or 'regionserver' or 'client' 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, http://git-wip-us.apache.org/repos/asf/ambari/blob/acbe6f10/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 aee496f..370aca0 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 @@ -67,6 +67,13 @@ class TestHBaseClient(RMFTestCase): configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] ) + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', @@ -151,6 +158,13 @@ class TestHBaseClient(RMFTestCase): configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] ) + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/acbe6f10/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 82c5404..433ad6e 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 @@ -226,6 +226,13 @@ class TestHBaseMaster(RMFTestCase): configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] ) + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', @@ -336,6 +343,13 @@ class TestHBaseMaster(RMFTestCase): configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] ) + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', @@ -456,7 +470,12 @@ class TestHBaseMaster(RMFTestCase): conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site']) - + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site']) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/acbe6f10/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 1b0a211..0b5f985 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 @@ -153,6 +153,13 @@ class TestHbaseRegionServer(RMFTestCase): configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] ) + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', @@ -263,6 +270,13 @@ class TestHbaseRegionServer(RMFTestCase): configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site'] ) + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop', @@ -383,7 +397,13 @@ class TestHbaseRegionServer(RMFTestCase): conf_dir = '/etc/hbase/conf', configurations = self.getConfig()['configurations']['hbase-site'], configuration_attributes = self.getConfig()['configuration_attributes']['hbase-site']) - + self.assertResourceCalled('XmlConfig', 'core-site.xml', + owner = 'hbase', + group = 'hadoop', + conf_dir = '/etc/hbase/conf', + configurations = self.getConfig()['configurations']['core-site'], + configuration_attributes = self.getConfig()['configuration_attributes']['core-site'] + ) self.assertResourceCalled('XmlConfig', 'hdfs-site.xml', owner = 'hbase', group = 'hadoop',
