AMBARI-6227. Hcatalog service check failed on start all services call (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e5988c4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e5988c4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e5988c4 Branch: refs/heads/trunk Commit: 7e5988c4b200a4111afc4e37cebfc9bef5710aa6 Parents: 49028c7 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Fri Jun 20 22:09:34 2014 +0300 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Fri Jun 20 22:09:34 2014 +0300 ---------------------------------------------------------------------- .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 1 + .../1.3.2/services/HIVE/package/scripts/hcat.py | 7 +++++++ .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 1 + .../2.0.6/services/HIVE/package/scripts/hcat.py | 7 +++++++ .../python/stacks/1.3.2/HIVE/test_hcat_client.py | 19 ++++++++++++++++++- .../python/stacks/2.0.6/HIVE/test_hcat_client.py | 15 +++++++++++++++ 6 files changed, 49 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5988c4/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml index df28384..7c929b3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml @@ -166,6 +166,7 @@ <configuration-dependencies> <config-type>global</config-type> + <config-type>hive-site</config-type> </configuration-dependencies> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5988c4/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat.py index 2993d3a..c25f530 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hcat.py @@ -35,6 +35,13 @@ def hcat(): recursive=True ) + XmlConfig("hive-site.xml", + conf_dir=params.hive_conf_dir, + configurations=params.config['configurations']['hive-site'], + owner=params.hive_user, + group=params.user_group, + mode=0644) + hcat_TemplateConfig('hcat-env.sh') http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5988c4/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml index 8a05620..5b927ca 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml @@ -183,6 +183,7 @@ </commandScript> <configuration-dependencies> <config-type>global</config-type> + <config-type>hive-site</config-type> </configuration-dependencies> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5988c4/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py index 2993d3a..c25f530 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hcat.py @@ -35,6 +35,13 @@ def hcat(): recursive=True ) + XmlConfig("hive-site.xml", + conf_dir=params.hive_conf_dir, + configurations=params.config['configurations']['hive-site'], + owner=params.hive_user, + group=params.user_group, + mode=0644) + hcat_TemplateConfig('hcat-env.sh') http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5988c4/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py index 6088548..a0f0dab 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py +++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py @@ -37,10 +37,19 @@ class TestHcatClient(RMFTestCase): owner = 'hcat', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'hive-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0644, + conf_dir = '/etc/hive/conf', + configurations = self.getConfig()['configurations']['hive-site'], + ) + self.assertResourceCalled('TemplateConfig', '/etc/hcatalog/conf/hcat-env.sh', owner = 'hcat', group = 'hadoop', ) + self.assertNoMoreResources() @@ -60,8 +69,16 @@ class TestHcatClient(RMFTestCase): owner = 'hcat', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'hive-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0644, + conf_dir = '/etc/hive/conf', + configurations = self.getConfig()['configurations']['hive-site'], + ) + self.assertResourceCalled('TemplateConfig', '/etc/hcatalog/conf/hcat-env.sh', owner = 'hcat', group = 'hadoop', ) - self.assertNoMoreResources() \ No newline at end of file + self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/7e5988c4/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py index 0ae1f6f..913bd45 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hcat_client.py @@ -37,6 +37,13 @@ class TestHcatClient(RMFTestCase): owner = 'hcat', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'hive-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0644, + conf_dir = '/etc/hive/conf', + configurations = self.getConfig()['configurations']['hive-site'], + ) self.assertResourceCalled('TemplateConfig', '/etc/hcatalog/conf/hcat-env.sh', owner = 'hcat', group = 'hadoop', @@ -60,8 +67,16 @@ class TestHcatClient(RMFTestCase): owner = 'hcat', recursive = True, ) + self.assertResourceCalled('XmlConfig', 'hive-site.xml', + owner = 'hive', + group = 'hadoop', + mode = 0644, + conf_dir = '/etc/hive/conf', + configurations = self.getConfig()['configurations']['hive-site'], + ) self.assertResourceCalled('TemplateConfig', '/etc/hcatalog/conf/hcat-env.sh', owner = 'hcat', group = 'hadoop', ) + self.assertNoMoreResources()
