Repository: ambari Updated Branches: refs/heads/branch-2.4 8630510c8 -> c03553d52
AMBARI-18190. Fix downloaded jar permission for the feature introduced in AMBARI-17955 (Venkat Ranganathan via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c03553d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c03553d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c03553d5 Branch: refs/heads/branch-2.4 Commit: c03553d520b279bfc05c63d21141580501c8c75c Parents: 8630510 Author: Alejandro Fernandez <[email protected]> Authored: Wed Aug 17 15:28:07 2016 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Wed Aug 17 15:28:07 2016 -0700 ---------------------------------------------------------------------- .../common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py | 5 +++-- .../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c03553d5/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py index 7a5cecb..6a3ad48 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py @@ -216,7 +216,8 @@ def falcon(type, action = None, upgrade_type=None): if not os.path.exists(params.target_jar_file): try : File(params.target_jar_file, - content = DownloadSource(params.bdb_resource_name)) + content = DownloadSource(params.bdb_resource_name), + mode = 0755) except : exc_msg = traceback.format_exc() exception_message = format("Caught Exception while downloading {bdb_resource_name}:\n{exc_msg}") @@ -225,7 +226,7 @@ def falcon(type, action = None, upgrade_type=None): if not os.path.isfile(params.target_jar_file) : error_message = """ If you are using bdb as the Falcon graph db store, please run -ambari-server setup --jdbc-db=bdb --jdbc-driver=<path to je5.0.73.jar +ambari-server setup --jdbc-db=bdb --jdbc-driver=<path to je5.0.73.jar> on the ambari server host. Otherwise falcon startup will fail. Otherwise please configure Falcon to use HBase as the backend as described in the Falcon documentation. http://git-wip-us.apache.org/repos/asf/ambari/blob/c03553d5/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 9f9b774..ab053b7 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 @@ -44,7 +44,8 @@ class TestFalconServer(RMFTestCase): self.assert_configure_default() self.assertResourceCalled('File', '/usr/lib/falcon/server/webapp/falcon/WEB-INF/lib/je-5.0.73.jar', - content=DownloadSource('http://c6401.ambari.apache.org:8080/resources//je-5.0.73.jar') + content=DownloadSource('http://c6401.ambari.apache.org:8080/resources//je-5.0.73.jar'), + mode=0755 ) self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-start -port 15000',
