ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-5712. WebHCAT pid dir is not correct (aonishuk)
Date Mon, 12 May 2014 12:06:14 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 9391b60aa -> b659079cb


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b659079c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b659079c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b659079c

Branch: refs/heads/trunk
Commit: b659079cb6889abc1ef19078b49268400b41aa71
Parents: 9391b60
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Mon May 12 15:06:03 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Mon May 12 15:06:03 2014 +0300

----------------------------------------------------------------------
 .../services/HCATALOG/configuration/global.xml          |  2 +-
 .../HDP/1.3.2/services/HIVE/configuration/global.xml    |  2 +-
 .../HDP/2.0.6/services/HIVE/configuration/global.xml    |  2 +-
 .../test/python/stacks/1.3.2/HIVE/test_hcat_client.py   |  4 ++--
 .../python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py  | 12 ++++++------
 .../python/stacks/1.3.2/configs/default.hbasedecom.json |  2 +-
 .../src/test/python/stacks/1.3.2/configs/default.json   |  2 +-
 .../stacks/1.3.2/configs/default.non_gmetad_host.json   |  2 +-
 .../src/test/python/stacks/1.3.2/configs/secured.json   |  2 +-
 .../1.3.0/services/HCATALOG/configuration/global.xml    |  2 +-
 .../assets/data/wizard/stack/hdp/version1.3.0/HIVE.json |  2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/HCATALOG/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/HCATALOG/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/HCATALOG/configuration/global.xml
index dd89409..b0c7eb6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2.GlusterFS/services/HCATALOG/configuration/global.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml
index fa999fc..5e4eb0e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/global.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
index 3d8cadc..1bee2b9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/global.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/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 d257da9..6088548 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
@@ -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,
     )

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py b/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
index 32600fc..e467b53 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/WEBHCAT/test_webhcat_server.py
+++ b/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,

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
index 9295c69..880208c 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
index 84dcc8d..078f533 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
b/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
index 57ec6d9..0bf5db5 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index 44f6506..6c922cf 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/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", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/configuration/global.xml
b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/configuration/global.xml
index dd89409..b0c7eb6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/configuration/global.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b659079c/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HIVE.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HIVE.json b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HIVE.json
index 12c9b86..71fa5ed 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HIVE.json
+++ b/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",


Mime
View raw message