You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ga...@apache.org on 2015/11/25 08:14:43 UTC
ambari git commit: AMBARI-14033. Wrong Audit JDBC URL generated,
even though JDBC URL format is overridden by user
Repository: ambari
Updated Branches:
refs/heads/trunk 21bbfd995 -> a1729a3e9
AMBARI-14033. Wrong Audit JDBC URL generated, even though JDBC URL format is overridden by user
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1729a3e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1729a3e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1729a3e
Branch: refs/heads/trunk
Commit: a1729a3e977a00379fe3ebf788ced391eeb4102e
Parents: 21bbfd9
Author: Gautam Borad <ga...@apache.org>
Authored: Tue Nov 24 15:30:37 2015 +0530
Committer: Gautam Borad <ga...@apache.org>
Committed: Wed Nov 25 12:44:34 2015 +0530
----------------------------------------------------------------------
.../0.96.0.2.0/package/scripts/params_linux.py | 6 +++++-
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 6 +++++-
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 6 +++++-
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 6 +++++-
.../KNOX/0.5.0.2.2/package/scripts/params_linux.py | 6 +++++-
.../RANGER/0.4.0/package/scripts/params.py | 9 ++++++++-
.../RANGER_KMS/0.5.0.2.3/package/scripts/params.py | 16 ++++++++++++++--
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 6 +++++-
.../YARN/2.1.0.2.0/package/scripts/params_linux.py | 6 +++++-
9 files changed, 57 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 96574c0..7dee23b 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -277,7 +277,11 @@ if has_ranger_admin:
elif xa_audit_db_flavor == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
jdbc_jar_name = "postgresql.jar"
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index 5017d39..587306b 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -418,7 +418,11 @@ if has_ranger_admin:
elif xa_audit_db_flavor == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
jdbc_jar_name = "postgresql.jar"
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index f2ddc80..972d532 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -507,7 +507,11 @@ if has_ranger_admin:
elif xa_audit_db_flavor and xa_audit_db_flavor == 'oracle':
ranger_jdbc_jar_name = "ojdbc6.jar"
ranger_jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor and xa_audit_db_flavor == 'postgres':
ranger_jdbc_jar_name = "postgresql.jar"
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
index 9eb9c4d..bd4fa6c 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
@@ -203,7 +203,11 @@ if has_ranger_admin and is_supported_kafka_ranger:
elif xa_audit_db_flavor and xa_audit_db_flavor == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor and xa_audit_db_flavor == 'postgres':
jdbc_jar_name = "postgresql.jar"
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 36d542f..c723de9 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -273,7 +273,11 @@ if has_ranger_admin:
elif xa_audit_db_flavor == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
jdbc_jar_name = "postgresql.jar"
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index ec1e3da..d7c0635 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -116,8 +116,12 @@ if db_flavor.lower() == 'mysql':
elif db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{db_host}')
jdbc_dialect = "org.eclipse.persistence.platform.database.OraclePlatform"
+ colon_count = db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{db_host}')
elif db_flavor.lower() == 'postgres':
jdbc_jar_name = "postgresql.jar"
jdbc_symlink_name = "postgres-jdbc-driver.jar"
@@ -179,3 +183,6 @@ ranger_ug_ldap_user_searchfilter = config["configurations"]["ranger-ugsync-site"
ranger_ug_ldap_group_searchbase = config["configurations"]["ranger-ugsync-site"]["ranger.usersync.group.searchbase"]
ranger_ug_ldap_group_searchfilter = config["configurations"]["ranger-ugsync-site"]["ranger.usersync.group.searchfilter"]
ug_sync_source = config["configurations"]["ranger-ugsync-site"]["ranger.usersync.source.impl.class"]
+current_host = config['hostname']
+if current_host in ranger_admin_hosts:
+ ranger_host = current_host
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/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 85db00b..2e2e52d 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
@@ -93,7 +93,11 @@ if db_flavor == 'mysql':
elif db_flavor == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- db_jdbc_url = format('jdbc:oracle:thin:@//{db_host}')
+ colon_count = db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ db_jdbc_url = format('jdbc:oracle:thin:@{db_host}')
+ else:
+ db_jdbc_url = format('jdbc:oracle:thin:@//{db_host}')
db_jdbc_driver = "oracle.jdbc.OracleDriver"
jdbc_dialect = "org.eclipse.persistence.platform.database.OraclePlatform"
elif db_flavor == 'postgres':
@@ -136,7 +140,11 @@ if has_ranger_admin:
elif xa_audit_db_flavor == 'oracle':
jdbc_jar = "ojdbc6.jar"
jdbc_symlink = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:\@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
jdbc_jar = "postgresql.jar"
@@ -183,3 +191,7 @@ ssl_truststore_password = unicode(config['configurations']['ranger-kms-policymgr
#For SQLA explicitly disable audit to DB for Ranger
if xa_audit_db_flavor == 'sqla':
xa_audit_db_is_enabled = False
+current_host = config['hostname']
+ranger_kms_hosts = config['clusterHostInfo']['ranger_kms_server_hosts']
+if current_host in ranger_kms_hosts:
+ kms_host = current_host
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
index dda71c8..f5d944c 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
@@ -215,7 +215,11 @@ if has_ranger_admin:
elif xa_audit_db_flavor == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
jdbc_jar_name = "postgresql.jar"
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1729a3e/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 14336ec..d45375f 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -361,7 +361,11 @@ if has_ranger_admin:
elif xa_audit_db_flavor and xa_audit_db_flavor == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
- audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
+ colon_count = xa_db_host.count(':')
+ if colon_count == 2 or colon_count == 0:
+ audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
+ else:
+ audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor and xa_audit_db_flavor == 'postgres':
jdbc_jar_name = "postgresql.jar"