Repository: ambari Updated Branches: refs/heads/branch-2.4 eaf9e1043 -> 5828e79f2 refs/heads/trunk e663b5cf4 -> 6fc67f80f
AMBARI-16984. Add changes for Ranger Service to get previous_jdbc_jar_name (Mugdha Varadkar via gautam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5828e79f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5828e79f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5828e79f Branch: refs/heads/branch-2.4 Commit: 5828e79f2b050820013ee8397560b97c009e9bdd Parents: eaf9e10 Author: Gautam Borad <gau...@apache.org> Authored: Fri Jun 3 08:08:03 2016 +0530 Committer: Gautam Borad <gau...@apache.org> Committed: Fri Jun 3 11:18:33 2016 +0530 ---------------------------------------------------------------------- .../functions/setup_ranger_plugin_xml.py | 2 +- .../0.4.0/package/scripts/setup_ranger.py | 8 +++----- .../0.4.0/package/scripts/setup_ranger_xml.py | 9 +++++++-- .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 21 ++++++++++---------- .../0.5.0.2.3/package/scripts/params.py | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5828e79f/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py index 80e5664..e5faf4b 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py @@ -49,7 +49,7 @@ def setup_ranger_plugin(component_select_name, service_name, previous_jdbc_jar, is_security_enabled = False, is_stack_supports_ranger_kerberos = False, component_user_principal = None, component_user_keytab = None): - if audit_db_is_enabled and component_driver_curl_source and not component_driver_curl_source.endswith("/None"): + if audit_db_is_enabled and component_driver_curl_source is not None and not component_driver_curl_source.endswith("/None"): if previous_jdbc_jar and os.path.isfile(previous_jdbc_jar): File(previous_jdbc_jar, action='delete') http://git-wip-us.apache.org/repos/asf/ambari/blob/5828e79f/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py index 3dc4914..638fe02 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py @@ -35,11 +35,9 @@ def setup_ranger_admin(upgrade_type=None): check_db_connnection() - if not params.jdbc_jar_name: - return - - if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar): - File(params.previous_jdbc_jar, action='delete') + if params.driver_curl_source and not params.driver_curl_source.endswith("/None"): + if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar): + File(params.previous_jdbc_jar, action='delete') File(params.downloaded_custom_connector, content = DownloadSource(params.driver_curl_source), http://git-wip-us.apache.org/repos/asf/ambari/blob/5828e79f/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py index 665fa48..30f9527 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py @@ -61,8 +61,7 @@ def setup_ranger_admin(upgrade_type=None): create_parents = True ) - if upgrade_type is not None: - copy_jdbc_connector() + copy_jdbc_connector() File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"), content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")), @@ -272,6 +271,10 @@ def password_validation(password): def copy_jdbc_connector(stack_version=None): import params + if params.driver_curl_source and not params.driver_curl_source.endswith("/None"): + if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar): + File(params.previous_jdbc_jar, action='delete') + File(params.downloaded_custom_connector, content = DownloadSource(params.driver_curl_source), mode = 0644 @@ -281,6 +284,8 @@ def copy_jdbc_connector(stack_version=None): if stack_version is not None: ranger_home = format("{stack_root}/{stack_version}/ranger-admin") + driver_curl_target = format("{ranger_home}/ews/lib/{jdbc_jar_name}") + if params.db_flavor.lower() == 'sqla': Execute(('tar', '-xvf', params.downloaded_custom_connector, '-C', params.tmp_dir), sudo = True) http://git-wip-us.apache.org/repos/asf/ambari/blob/5828e79f/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py index e446c43..eaa6e4c 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py @@ -139,8 +139,7 @@ def kms(upgrade_type=None): create_parents = True ) - if upgrade_type is not None: - copy_jdbc_connector(stack_version=params.version) + copy_jdbc_connector() File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"), content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")), @@ -152,12 +151,12 @@ def kms(upgrade_type=None): cp = cp + os.pathsep + format("{kms_home}/ews/webapp/lib/sajdbc4.jar") else: path_to_jdbc = format("{kms_home}/ews/webapp/lib/{jdbc_jar_name}") - if not params.jdbc_jar_name: - path_to_jdbc = format("{kms_home}/ews/webapp/lib/") + params.default_connectors_map[params.db_flavor] + if not os.path.isfile(path_to_jdbc): + path_to_jdbc = format("{kms_home}/ews/webapp/lib/") + params.default_connectors_map[params.db_flavor.lower()] if not os.path.isfile(path_to_jdbc): path_to_jdbc = format("{kms_home}/ews/webapp/lib/") + "*" error_message = "Error! Sorry, but we can't find jdbc driver with default name " + params.default_connectors_map[params.db_flavor] + \ - " in oozie lib dir. So, db connection check can fail. Please run 'ambari-server setup --jdbc-db={db_name} --jdbc-driver={path_to_jdbc} on server host.'" + " in ranger kms lib dir. So, db connection check can fail. Please run 'ambari-server setup --jdbc-db={db_name} --jdbc-driver={path_to_jdbc} on server host.'" print error_message Logger.error(error_message) @@ -172,7 +171,7 @@ def kms(upgrade_type=None): Execute(db_connection_check_command, path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin', tries=5, try_sleep=10, environment=env_dict) - if params.xa_audit_db_is_enabled and params.jdbc_jar: + if params.xa_audit_db_is_enabled and params.driver_source is not None and not params.driver_source.endswith("/None"): if params.xa_previous_jdbc_jar and os.path.isfile(params.xa_previous_jdbc_jar): File(params.xa_previous_jdbc_jar, action='delete') @@ -302,16 +301,16 @@ def kms(upgrade_type=None): def copy_jdbc_connector(stack_version=None): import params - if not params.jdbc_jar_name: - return - - if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar): - File(params.previous_jdbc_jar, action='delete') + if params.driver_curl_source and not params.driver_curl_source.endswith("/None"): + if params.previous_jdbc_jar and os.path.isfile(params.previous_jdbc_jar): + File(params.previous_jdbc_jar, action='delete') kms_home = params.kms_home if stack_version is not None: kms_home = format("{stack_root}/{stack_version}/ranger-kms") + driver_curl_target = format("{kms_home}/ews/webapp/lib/{jdbc_jar_name}") + File(params.downloaded_custom_connector, content = DownloadSource(params.driver_curl_source), mode = 0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/5828e79f/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py index 03c1258..17f71fb 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py @@ -186,7 +186,7 @@ if has_ranger_admin: downloaded_connector_path = format("{tmp_dir}/{jdbc_jar}") if stack_supports_ranger_audit_db else None driver_source = format("{jdk_location}/{jdbc_jar}") if stack_supports_ranger_audit_db else None driver_target = format("{kms_home}/ews/webapp/lib/{jdbc_jar}") if stack_supports_ranger_audit_db else None - xa_previous_jdbc_jar_name = format("{kms_home}/ews/webapp/lib/{previous_jdbc_jar_name}") if stack_supports_ranger_audit_db else None + xa_previous_jdbc_jar = format("{kms_home}/ews/webapp/lib/{previous_jdbc_jar_name}") if stack_supports_ranger_audit_db else None repo_config_username = config['configurations']['kms-properties']['REPOSITORY_CONFIG_USERNAME'] repo_config_password = unicode(config['configurations']['kms-properties']['REPOSITORY_CONFIG_PASSWORD'])
