Repository: ambari Updated Branches: refs/heads/branch-2.4 a9f512e6f -> d6685f9e7
AMBARI-16263 - Falcon server start fails Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6685f9e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6685f9e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6685f9e Branch: refs/heads/branch-2.4 Commit: d6685f9e71269e3999b52b11a8734b6ff69c56d6 Parents: a9f512e Author: tbeerbower <tbeerbo...@hortonworks.com> Authored: Thu May 12 13:54:13 2016 -0400 Committer: tbeerbower <tbeerbo...@hortonworks.com> Committed: Thu May 12 17:42:30 2016 -0400 ---------------------------------------------------------------------- .../0.5.0.2.1/configuration/falcon-env.xml | 3 +++ .../0.5.0.2.1/package/scripts/params_linux.py | 1 + .../package/scripts/setup_atlas_falcon.py | 19 ------------------- 3 files changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d6685f9e/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml index 3fdf2e6..9c1e85f 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml @@ -157,6 +157,9 @@ export FALCON_DATA_DIR={{falcon_embeddedmq_data}} # Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir. #export FALCON_EXPANDED_WEBAPP_DIR= + +# Add the Atlas Falcon hook to the Falcon classpath +export FALCON_EXTRA_CLASS_PATH={{atlas_hook_cp}}${FALCON_EXTRA_CLASS_PATH} </value> <value-attributes> <type>content</type> http://git-wip-us.apache.org/repos/asf/ambari/blob/d6685f9e/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py index bf7f437..8e666ac 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py @@ -123,6 +123,7 @@ if has_atlas: atlas_conf_file = config['configurations']['atlas-env']['metadata_conf_file'] atlas_conf_dir = os.environ['METADATA_CONF'] if 'METADATA_CONF' in os.environ else '/etc/atlas/conf' atlas_home_dir = os.environ['METADATA_HOME_DIR'] if 'METADATA_HOME_DIR' in os.environ else format('{stack_root}/current/atlas-server') + atlas_hook_cp = atlas_conf_dir + os.pathsep + os.path.join(atlas_home_dir, "hook", "falcon", "*") + os.pathsep hdfs_site = config['configurations']['hdfs-site'] default_fs = config['configurations']['core-site']['fs.defaultFS'] http://git-wip-us.apache.org/repos/asf/ambari/blob/d6685f9e/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/setup_atlas_falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/setup_atlas_falcon.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/setup_atlas_falcon.py index 4b7c0c3..67077c4 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/setup_atlas_falcon.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/setup_atlas_falcon.py @@ -19,8 +19,6 @@ limitations under the License. """ from resource_management.core.resources.packaging import Package -from resource_management.core.resources.system import Directory -from resource_management.core.resources.system import Link from ambari_commons import OSCheck import os @@ -33,20 +31,3 @@ def setup_atlas_falcon(): if not params.host_sys_prepped: Package(params.atlas_ubuntu_plugin_package if OSCheck.is_ubuntu_family() else params.atlas_plugin_package, retry_on_repo_unavailability=params.agent_stack_retry_on_unavailability, retry_count=params.agent_stack_retry_count) - - atlas_falcon_hook_dir = os.path.join(params.atlas_home_dir, "hook", "falcon") - if os.path.exists(atlas_falcon_hook_dir): - Link(os.path.join(params.falcon_conf_dir, params.atlas_conf_file), - to = os.path.join(params.atlas_conf_dir, params.atlas_conf_file) - ) - - Directory(params.falcon_webinf_lib, - owner = params.falcon_user, - create_parents = True) - - src_files = os.listdir(atlas_falcon_hook_dir) - for file_name in src_files: - atlas_falcon_hook_file_name = os.path.join(atlas_falcon_hook_dir, file_name) - falcon_lib_file_name = os.path.join(params.falcon_webinf_lib, file_name) - if (os.path.isfile(atlas_falcon_hook_file_name)): - Link(falcon_lib_file_name, to = atlas_falcon_hook_file_name)
