Repository: ambari Updated Branches: refs/heads/trunk 80afc9f02 -> 4f84615da
AMBARI-10100 WEBHCAT_SERVER START is failed after Ambari only upgrade from 1.4.4 to 2.0.0 (failed, parent directory /etc/hive-webhcat doesn't exist) (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f84615d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f84615d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f84615d Branch: refs/heads/trunk Commit: 4f84615da39c64aab3ee31b23420b98db7926223 Parents: 80afc9f Author: Dmytro Sen <[email protected]> Authored: Tue Mar 17 12:36:14 2015 +0200 Committer: Dmytro Sen <[email protected]> Committed: Tue Mar 17 12:36:36 2015 +0200 ---------------------------------------------------------------------- .../common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py | 1 + .../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4f84615d/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py index b2008ab..4f1d564 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py @@ -150,6 +150,7 @@ def webhcat(): Directory(params.webhcat_conf_dir, cd_access='a', + recursive=True ) log4j_webhcat_filename = 'webhcat-log4j.properties' http://git-wip-us.apache.org/repos/asf/ambari/blob/4f84615d/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 d070980..e8a34fd 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 @@ -214,6 +214,7 @@ class TestWebHCatServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf', cd_access = 'a', + recursive=True ) self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-log4j.properties', content = 'log4jproperties\nline2', @@ -325,6 +326,7 @@ class TestWebHCatServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf', cd_access = 'a', + recursive=True ) self.assertResourceCalled('File', '/etc/hcatalog/conf/webhcat-log4j.properties', content = 'log4jproperties\nline2', @@ -446,4 +448,4 @@ class TestWebHCatServer(RMFTestCase): hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES ) - put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) \ No newline at end of file + put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"})
