You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/03/12 14:46:58 UTC
[2/2] ambari git commit: AMBARI-10041. WebHCat Server Start is
failed. (Umask -027) (aonishuk)
AMBARI-10041. WebHCat Server Start is failed. (Umask -027) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7a1e717
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7a1e717
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7a1e717
Branch: refs/heads/branch-2.0.0
Commit: b7a1e7174189be9e6f371f93795515c26a034c27
Parents: 9c9c304
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Mar 12 15:46:50 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Mar 12 15:46:50 2015 +0200
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/webhcat_service.py | 2 +-
.../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7a1e717/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py
index 25a60e8..d1251df 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service.py
@@ -26,7 +26,7 @@ def webhcat_service(action='start'):
cmd = format('env HADOOP_HOME={hadoop_home} {webhcat_bin_dir}/webhcat_server.sh')
if action == 'start':
- demon_cmd = format('{cmd} start')
+ demon_cmd = format('cd {hcat_pid_dir} ; {cmd} start')
no_op_test = format('ls {webhcat_pid_file} >/dev/null 2>&1 && ps -p `cat {webhcat_pid_file}` >/dev/null 2>&1')
Execute(demon_cmd,
user=params.webhcat_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7a1e717/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index 7ed2628..2663d18 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -47,7 +47,7 @@ class TestWebHCatServer(RMFTestCase):
)
self.assert_configure_default()
- self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
+ self.assertResourceCalled('Execute', 'cd /var/run/webhcat ; env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps -p `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1',
user = 'hcat'
)
@@ -92,7 +92,7 @@ class TestWebHCatServer(RMFTestCase):
)
self.assert_configure_secured()
- self.assertResourceCalled('Execute', 'env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
+ self.assertResourceCalled('Execute', 'cd /var/run/webhcat ; env HADOOP_HOME=/usr /usr/lib/hcatalog/sbin/webhcat_server.sh start',
not_if = 'ls /var/run/webhcat/webhcat.pid >/dev/null 2>&1 && ps -p `cat /var/run/webhcat/webhcat.pid` >/dev/null 2>&1',
user = 'hcat'
)