AMBARI-6227. Hcatalog service check failed on start all services call (dlysnichenko)

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>

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')
 
 

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>
 

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')
 
 

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()
+    self.assertNoMoreResources()

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()