You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/05/21 17:31:19 UTC
ambari git commit: AMBARI-11305 Hive service check fails after moving
Webhcat Server (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 0d5a3b28e -> 3b4c7aea6
AMBARI-11305 Hive service check fails after moving Webhcat Server (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b4c7aea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b4c7aea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b4c7aea
Branch: refs/heads/trunk
Commit: 3b4c7aea6fc010935ea76439a0e08b774c4641cd
Parents: 0d5a3b2
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu May 21 18:30:32 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu May 21 18:30:32 2015 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py | 1 +
.../src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b4c7aea/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py
index 09fb690..b22e631 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat_service_check.py
@@ -53,6 +53,7 @@ def webhcat_service_check():
File(format("{tmp_dir}/{templeton_test_script}"),
content = Template("templeton_smoke.pig.j2", templeton_test_input=templeton_test_input, templeton_test_output=templeton_test_output),
+ owner=params.hdfs_user
)
params.HdfsResource(format("/tmp/{templeton_test_script}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b4c7aea/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 86d348f..1a68b61 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -85,6 +85,7 @@ class TestServiceCheck(RMFTestCase):
)
self.assertResourceCalled('File', '/tmp/idtest.ambari-qa.1431110511.43.pig',
content = Template('templeton_smoke.pig.j2', templeton_test_input='/tmp/idtest.ambari-qa.1431110511.43.in', templeton_test_output='/tmp/idtest.ambari-qa.1431110511.43.out'),
+ owner="hdfs"
)
self.assertResourceCalled('HdfsResource', '/tmp/idtest.ambari-qa.1431110511.43.pig',
security_enabled = False,
@@ -185,6 +186,7 @@ class TestServiceCheck(RMFTestCase):
self.assertResourceCalled('File', '/tmp/idtest.ambari-qa.1431110511.43.pig',
content = Template('templeton_smoke.pig.j2', templeton_test_input='/tmp/idtest.ambari-qa.1431110511.43.in', templeton_test_output='/tmp/idtest.ambari-qa.1431110511.43.out'),
+ owner = "hdfs"
)
self.assertResourceCalled('HdfsResource', '/tmp/idtest.ambari-qa.1431110511.43.pig',
action = ['create_on_execute'],
@@ -225,4 +227,4 @@ class TestServiceCheck(RMFTestCase):
tries = 3,
try_sleep = 5,
)
- self.assertNoMoreResources()
\ No newline at end of file
+ self.assertNoMoreResources()