AMBARI-5712. WebHCAT pid dir is not correct (aonishuk)

ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/HCATALOG/configuration/global.xml

@@ -28,7 +28,7 @@
   </property>
   <property>
     <name>hcat_pid_dir</name>
-    <value>/etc/run/webhcat</value>
+    <value>/var/run/webhcat</value>
     <description>WebHCat Pid Dir.</description>
   </property>
   <property>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml

@@ -109,7 +109,7 @@
   </property>
   <property>
     <name>hcat_pid_dir</name>
-    <value>/etc/run/webhcat</value>
+    <value>/var/run/webhcat</value>
     <description>WebHCat Pid Dir.</description>
   </property>
   <property>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml

@@ -109,7 +109,7 @@
   </property>
   <property>
     <name>hcat_pid_dir</name>
-    <value>/etc/run/webhcat</value>
+    <value>/var/run/webhcat</value>
     <description>WebHCat Pid Dir.</description>
   </property>
   <property>

ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hcat_client.py

@@ -33,7 +33,7 @@ class TestHcatClient(RMFTestCase):
       owner = 'hcat',
       group = 'hadoop',
     )
-    self.assertResourceCalled('Directory', '/etc/run/webhcat',
+    self.assertResourceCalled('Directory', '/var/run/webhcat',
       owner = 'hcat',
       recursive = True,
     )
@@ -56,7 +56,7 @@ class TestHcatClient(RMFTestCase):
       owner = 'hcat',
       group = 'hadoop',
     )
-    self.assertResourceCalled('Directory', '/etc/run/webhcat',
+    self.assertResourceCalled('Directory', '/var/run/webhcat',
       owner = 'hcat',
       recursive = True,
     )

ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py

@@ -40,7 +40,7 @@ class TestWebHCatServer(RMFTestCase):
 
     self.assert_configure_default()
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
-                              not_if = 'ls /etc/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /etc/run/webhcat/webhcat.pid` >/dev/null 2>&1',
+                              not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1',
                               user = 'hcat'
     )
     self.assertNoMoreResources()
@@ -55,7 +55,7 @@ class TestWebHCatServer(RMFTestCase):
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop',
                               user = 'hcat',
                               )
-    self.assertResourceCalled('Execute', 'rm -f /etc/run/webhcat/webhcat.pid')
+    self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid')
     self.assertNoMoreResources()
 
     def test_configure_secured(self):
@@ -77,7 +77,7 @@ class TestWebHCatServer(RMFTestCase):
 
     self.assert_configure_secured()
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
-                              not_if = 'ls /etc/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /etc/run/webhcat/webhcat.pid` >/dev/null 2>&1',
+                              not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1',
                               user = 'hcat'
     )
     self.assertNoMoreResources()
@@ -92,7 +92,7 @@ class TestWebHCatServer(RMFTestCase):
     self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh stop',
                               user = 'hcat',
                               )
-    self.assertResourceCalled('Execute', 'rm -f /etc/run/webhcat/webhcat.pid')
+    self.assertResourceCalled('Execute', 'rm -f /var/run/webhcat/webhcat.pid')
     self.assertNoMoreResources()
 
   def assert_configure_default(self):
@@ -124,7 +124,7 @@ class TestWebHCatServer(RMFTestCase):
                               kinit_path_local = "/usr/bin/kinit",
                               action = ['create'],
                               )
-    self.assertResourceCalled('Directory', '/etc/run/webhcat',
+    self.assertResourceCalled('Directory', '/var/run/webhcat',
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,
@@ -202,7 +202,7 @@ class TestWebHCatServer(RMFTestCase):
                               kinit_path_local = '/usr/bin/kinit',
                               action = ['create'],
                               )
-    self.assertResourceCalled('Directory', '/etc/run/webhcat',
+    self.assertResourceCalled('Directory', '/var/run/webhcat',
       owner = 'hcat',
       group = 'hadoop',
       recursive = True,

ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json

@@ -183,7 +183,7 @@
             "hive_metastore_port": "9083", 
             "hbase_master_heapsize": "1024m", 
             "zk_data_dir": "/hadoop/zookeeper", 
-            "hcat_pid_dir": "/etc/run/webhcat", 
+            "hcat_pid_dir": "/var/run/webhcat",
             "oozie_jdbc_driver": "org.apache.derby.jdbc.EmbeddedDriver", 
             "initLimit": "10", 
             "hive_database_type": "mysql", 

ambari-server/src/test/python/stacks/1.3.2/configs/default.json

@@ -183,7 +183,7 @@
             "hive_metastore_port": "9083", 
             "hbase_master_heapsize": "1024m", 
             "zk_data_dir": "/hadoop/zookeeper", 
-            "hcat_pid_dir": "/etc/run/webhcat", 
+            "hcat_pid_dir": "/var/run/webhcat",
             "oozie_jdbc_driver": "org.apache.derby.jdbc.EmbeddedDriver", 
             "initLimit": "10", 
             "hive_database_type": "mysql", 

ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json

@@ -183,7 +183,7 @@
             "hive_metastore_port": "9083", 
             "hbase_master_heapsize": "1024m", 
             "zk_data_dir": "/hadoop/zookeeper", 
-            "hcat_pid_dir": "/etc/run/webhcat", 
+            "hcat_pid_dir": "/var/run/webhcat",
             "oozie_jdbc_driver": "org.apache.derby.jdbc.EmbeddedDriver", 
             "initLimit": "10", 
             "hive_database_type": "mysql", 

ambari-server/src/test/python/stacks/1.3.2/configs/secured.json

@@ -191,7 +191,7 @@
             "nagios_primary_name": "nagios", 
             "jobtracker_principal_name": "jt/_HOST", 
             "hive_database": "New MySQL Database", 
-            "hcat_pid_dir": "/etc/run/webhcat", 
+            "hcat_pid_dir": "/var/run/webhcat",
             "oozie_derby_database": "Derby", 
             "snappy_enabled": "true", 
             "oozie_pid_dir": "/var/run/oozie", 

ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/configuration/global.xml

@@ -28,7 +28,7 @@
   </property>
   <property>
     <name>hcat_pid_dir</name>
-    <value>/etc/run/webhcat</value>
+    <value>/var/run/webhcat</value>
     <description>WebHCat Pid Dir.</description>
   </property>
   <property>

ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HIVE.json

@@ -54,7 +54,7 @@
       "StackConfigurations" : {
         "property_description" : "WebHCat Pid Dir.",
         "property_name" : "hcat_pid_dir",
-        "property_value" : "/etc/run/webhcat",
+        "property_value" : "/var/run/webhcat",
         "service_name" : "HIVE",
         "stack_name" : "HDP",
         "stack_version" : "1.3.0",