ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mug...@apache.org
Subject ambari git commit: AMBARI-19288 : Do not install hive-hook from Ambari if falcon client is installed. (Vishal Suvagia via mugdha)
Date Fri, 13 Jan 2017 10:15:01 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a8aa8ab17 -> 51408ab69


AMBARI-19288 : Do not install hive-hook from Ambari if falcon client is installed. (Vishal
Suvagia via mugdha)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/51408ab6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/51408ab6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/51408ab6

Branch: refs/heads/branch-2.5
Commit: 51408ab69b3598366389bc5d0dcda97c46cbc954
Parents: a8aa8ab
Author: Vishal Suvagia <vishalsuvagia@yahoo.com>
Authored: Fri Jan 13 14:55:44 2017 +0530
Committer: Mugdha Varadkar <mugdha@apache.org>
Committed: Fri Jan 13 15:44:27 2017 +0530

----------------------------------------------------------------------
 .../resource_management/libraries/functions/constants.py    | 1 +
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py              | 9 +++++----
 .../stacks/HDP/2.0.6/properties/stack_features.json         | 5 +++++
 3 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/51408ab6/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
index 6fba224..05510cd 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/constants.py
@@ -109,3 +109,4 @@ class StackFeature:
   RANGER_SOLR_CONFIG_SUPPORT='ranger_solr_config_support'
   HIVE_INTERACTIVE_ATLAS_HOOK_REQUIRED="hive_interactive_atlas_hook_required"
   CORE_SITE_FOR_RANGER_PLUGINS_SUPPORT='core_site_for_ranger_plugins'
+  ATLAS_INSTALL_HOOK_PACKAGE_SUPPORT="atlas_install_hook_package_support"

http://git-wip-us.apache.org/repos/asf/ambari/blob/51408ab6/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 d7981e1..70caaea 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
@@ -93,7 +93,7 @@ def falcon(type, action = None, upgrade_type=None):
       properties = params.falcon_client_properties,
       mode = 0644,
       owner = params.falcon_user)
-      
+
     PropertiesFile(params.falcon_conf_dir + '/runtime.properties',
       properties = params.falcon_runtime_properties,
       mode = 0644,
@@ -129,8 +129,9 @@ def falcon(type, action = None, upgrade_type=None):
     # Generate atlas-application.properties.xml file
     if params.falcon_atlas_support and params.enable_atlas_hook:
       # If Atlas is added later than Falcon, this package will be absent.
-      install_atlas_hook_packages(params.atlas_plugin_package, params.atlas_ubuntu_plugin_package,
params.host_sys_prepped,
-                                  params.agent_stack_retry_on_unavailability, params.agent_stack_retry_count)
+      if check_stack_feature(StackFeature.ATLAS_INSTALL_HOOK_PACKAGE_SUPPORT,params.current_version_formatted):
+        install_atlas_hook_packages(params.atlas_plugin_package, params.atlas_ubuntu_plugin_package,
params.host_sys_prepped,
+                                    params.agent_stack_retry_on_unavailability, params.agent_stack_retry_count)
 
       atlas_hook_filepath = os.path.join(params.falcon_conf_dir, params.atlas_hook_filename)
       setup_atlas_hook(SERVICE.FALCON, params.falcon_atlas_application_properties, atlas_hook_filepath,
params.falcon_user, params.user_group)
@@ -272,7 +273,7 @@ in the Falcon documentation.
       except:
         show_logs(params.falcon_log_dir, params.falcon_user)
         raise
-      
+
       File(params.server_pid_file, action = 'delete')
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/51408ab6/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
index a753f89..bb7f596 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
@@ -348,6 +348,11 @@
       "name": "core_site_for_ranger_plugins",
       "description": "Adding core-site.xml in when Ranger plugin is enabled for Storm, Kafka,
and Knox.",
       "min_version": "2.6.0.0"
+    },
+    {
+      "name": "atlas_install_hook_package_support",
+      "description": "Stop installing packages from 2.6",
+      "max_version": "2.5.9.9"
     }
   ]
 }


Mime
View raw message