Repository: ambari Updated Branches: refs/heads/branch-1.7.0 07fc52128 -> e7edf02de refs/heads/trunk 42cf9b21c -> 1b94497d3
AMBARI-7978. Falcon client install fails and hence HDP install fails when Falcon log directory is customized (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b94497d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b94497d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b94497d Branch: refs/heads/trunk Commit: 1b94497d3183528c344d751f059f4e1ef5d20f81 Parents: 42cf9b2 Author: Andrew Onishuk <[email protected]> Authored: Sun Oct 26 18:34:20 2014 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Sun Oct 26 18:34:20 2014 +0200 ---------------------------------------------------------------------- .../stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py | 3 ++- .../src/test/python/stacks/2.1/FALCON/test_falcon_client.py | 1 + .../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1b94497d/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py index 05a685a..37dd213 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py @@ -26,7 +26,8 @@ def falcon(type, action = None): owner=params.falcon_user ) Directory(params.falcon_log_dir, - owner=params.falcon_user + owner=params.falcon_user, + recursive=True ) Directory(params.falcon_webapp_dir, owner=params.falcon_user http://git-wip-us.apache.org/repos/asf/ambari/blob/1b94497d/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py index 325c06a..edc2318 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py @@ -33,6 +33,7 @@ class TestFalconClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', + recursive = True ) self.assertResourceCalled('Directory', '/var/lib/falcon/webapp', owner = 'falcon', http://git-wip-us.apache.org/repos/asf/ambari/blob/1b94497d/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index 57bf715..590e234 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py @@ -66,6 +66,7 @@ class TestFalconServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/falcon', owner = 'falcon', + recursive = True ) self.assertResourceCalled('Directory', '/var/lib/falcon/webapp', owner = 'falcon',
