You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/06/09 23:15:14 UTC
ambari git commit: AMBARI-11819. After rolling upgrade,
Ranger solr properties are showing up as required (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 8b535db8b -> 7084cb798
AMBARI-11819. After rolling upgrade, Ranger solr properties are showing up as required (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7084cb79
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7084cb79
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7084cb79
Branch: refs/heads/trunk
Commit: 7084cb798451b842dc5d1a894f8492bbcf318cbf
Parents: 8b535db
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Jun 9 15:56:24 2015 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Jun 9 16:31:33 2015 -0400
----------------------------------------------------------------------
.../upgrades/RangerConfigCalculation.java | 15 ++++++++++++++-
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 7 -------
.../upgrades/RangerConfigCalculationTest.java | 3 ++-
3 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7084cb79/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java
index ed41c8a..ebec177 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java
@@ -59,6 +59,7 @@ public class RangerConfigCalculation extends AbstractServerAction {
String dbProp = "DB_FLAVOR";
String dbHostProp = "db_host";
String dbNameProp = "db_name";
+ String dbAuditNameProp = "audit_db_name";
StringBuilder stdout = new StringBuilder();
@@ -79,9 +80,16 @@ public class RangerConfigCalculation extends AbstractServerAction {
String dbHost = sourceConfig.getProperties().get(dbHostProp);
String dbName = sourceConfig.getProperties().get(dbNameProp);
+ String auditDbName = sourceConfig.getProperties().get(dbAuditNameProp);
+
+ // !!! just in case it's not set
+ if (null == auditDbName) {
+ auditDbName = dbName;
+ }
stdout.append(MessageFormat.format("Database host: {0}\n", dbHost));
stdout.append(MessageFormat.format("Database name: {0}\n", dbName));
+ stdout.append(MessageFormat.format("Audit database name: {0}\n", auditDbName));
if (null == dbHost) {
stdout.append(MessageFormat.format("Hostname must be set using {0}/{1} , skipping", SOURCE_CONFIG_TYPE, dbHostProp));
@@ -92,6 +100,7 @@ public class RangerConfigCalculation extends AbstractServerAction {
String driver = null;
String url = null;
String dialect = null;
+ String auditUrl = null;
if ("mysql".equals(db)) {
if (null == dbName) {
@@ -101,15 +110,18 @@ public class RangerConfigCalculation extends AbstractServerAction {
}
driver = "com.mysql.jdbc.Driver";
url = MessageFormat.format("jdbc:mysql://{0}/{1}", dbHost, dbName);
+ auditUrl = MessageFormat.format("jdbc:mysql://{0}/{1}", dbHost, auditDbName);
dialect = "org.eclipse.persistence.platform.database.MySQLPlatform";
} else if ("oracle".equals(db)) {
driver = "oracle.jdbc.OracleDriver";
url = MessageFormat.format("jdbc:oracle:thin:@//{0}", dbHost);
+ auditUrl = MessageFormat.format("jdbc:oracle:thin:@//{0}", dbHost);
dialect = "org.eclipse.persistence.platform.database.OraclePlatform";
}
stdout.append(MessageFormat.format("Database driver: {0}\n", driver));
stdout.append(MessageFormat.format("Database url: {0}\n", url));
+ stdout.append(MessageFormat.format("Database audit url: {0}\n", auditUrl));
stdout.append(MessageFormat.format("Database dialect: {0}", dialect));
Config config = cluster.getDesiredConfigByType("ranger-admin-site");
@@ -119,7 +131,7 @@ public class RangerConfigCalculation extends AbstractServerAction {
targetValues.put("ranger.jpa.jdbc.dialect", dialect);
targetValues.put("ranger.jpa.audit.jdbc.driver", driver);
- targetValues.put("ranger.jpa.audit.jdbc.url", url);
+ targetValues.put("ranger.jpa.audit.jdbc.url", auditUrl);
targetValues.put("ranger.jpa.audit.jdbc.dialect", dialect);
config.setProperties(targetValues);
@@ -129,4 +141,5 @@ public class RangerConfigCalculation extends AbstractServerAction {
}
+
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7084cb79/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 7967173..10bca13 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -354,13 +354,6 @@
<transfer operation="copy" from-type="admin-properties" from-key="db_password" to-key="ranger.jpa.jdbc.password" default-value="" mask="true" />
<transfer operation="copy" from-type="admin-properties" from-key="audit_db_user" to-key="ranger.jpa.audit.jdbc.user" default-value="" />
<transfer operation="copy" from-type="admin-properties" from-key="audit_db_password" to-key="ranger.jpa.audit.jdbc.password" default-value="" mask="true" />
-
- <set key="ranger.audit.solr.urls" value="" />
- <set key="ranger.audit.solr.zookeepers" value="" />
- <set key="ranger.audit.solr.username" value="" />
- <set key="ranger.audit.solr.password" value="" />
- <set key="ranger.audit.solr.authentication-method" value="" />
- <set key="ranger.audit.source.type" value="" />
</task>
<task xsi:type="server_action" summary="Calculating Ranger Properties" class="org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation" />
http://git-wip-us.apache.org/repos/asf/ambari/blob/7084cb79/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculationTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculationTest.java
index 88fa58e..1bd0de4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculationTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculationTest.java
@@ -62,6 +62,7 @@ public class RangerConfigCalculationTest {
put("DB_FLAVOR", "MYSQL");
put("db_host", "host1");
put("db_name", "ranger");
+ put("audit_db_name", "ranger_audit");
}};
@Override
public Map<String, String> getProperties() {
@@ -140,7 +141,7 @@ public class RangerConfigCalculationTest {
assertEquals("org.eclipse.persistence.platform.database.MySQLPlatform", map.get("ranger.jpa.jdbc.dialect"));
assertEquals("com.mysql.jdbc.Driver", map.get("ranger.jpa.audit.jdbc.driver"));
- assertEquals("jdbc:mysql://host1/ranger", map.get("ranger.jpa.audit.jdbc.url"));
+ assertEquals("jdbc:mysql://host1/ranger_audit", map.get("ranger.jpa.audit.jdbc.url"));
assertEquals("org.eclipse.persistence.platform.database.MySQLPlatform", map.get("ranger.jpa.audit.jdbc.dialect"));
config = c.getDesiredConfigByType("admin-properties");