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 2016/02/01 16:41:51 UTC
[14/39] ambari git commit: AMBARI-14831. Upgrading ambari-server from
2.0.1 to 2.2.0 sets incorrect value for
"storm.zookeeper.superACL".(vbrodetskyi)
AMBARI-14831. Upgrading ambari-server from 2.0.1 to 2.2.0 sets incorrect value for "storm.zookeeper.superACL".(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/195a3595
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/195a3595
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/195a3595
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 195a35953606263d2810b10a731f3b295aa29a60
Parents: e72a6b4
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Jan 28 21:29:15 2016 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Jan 28 21:29:15 2016 +0200
----------------------------------------------------------------------
.../ambari/server/upgrade/UpgradeCatalog210.java | 4 +---
.../ambari/server/upgrade/UpgradeCatalog222.java | 15 +++++++++++++++
.../ambari/server/upgrade/UpgradeCatalog222Test.java | 6 ++++--
3 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/195a3595/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 7940e02..faf4b96 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -24,7 +24,6 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -47,7 +46,6 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
-import org.apache.ambari.server.state.kerberos.AbstractKerberosDescriptorContainer;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
@@ -1648,7 +1646,7 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
newStormProps.put("nimbus.supervisors.users", "['{{storm_user}}']");
}
if (!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("storm.zookeeper.superACL")) {
- newStormProps.put("storm.zookeeper.superACL", "sasl:{{storm_base_jaas_principal}}");
+ newStormProps.put("storm.zookeeper.superACL", "sasl:{{storm_bare_jaas_principal}}");
}
if (!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("ui.filter.params")) {
newStormProps.put("ui.filter.params", "{'type': 'kerberos', 'kerberos.principal': '{{storm_ui_jaas_principal}}', 'kerberos.keytab': '{{storm_ui_keytab_path}}', 'kerberos.name.rules': 'DEFAULT'}");
http://git-wip-us.apache.org/repos/asf/ambari/blob/195a3595/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
index bcbbf41..22f6a39 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.SQLException;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -97,7 +98,21 @@ public class UpgradeCatalog222 extends AbstractUpgradeCatalog {
protected void executeDMLUpdates() throws AmbariException, SQLException {
addNewConfigurationsFromXml();
updateAlerts();
+ updateStormConfigs();
+ }
+
+ protected void updateStormConfigs() throws AmbariException {
+ AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
+ Map<String, Cluster> clusterMap = getCheckedClusterMap(ambariManagementController.getClusters());
+ for (final Cluster cluster : clusterMap.values()) {
+ if (cluster.getDesiredConfigByType("storm-site") != null && cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("storm.zookeeper.superACL")
+ && cluster.getDesiredConfigByType("storm-site").getProperties().get("storm.zookeeper.superACL").equals("sasl:{{storm_base_jaas_principal}}")) {
+ Map<String, String> newStormProps = new HashMap<String, String>();
+ newStormProps.put("storm.zookeeper.superACL", "sasl:{{storm_bare_jaas_principal}}");
+ updateConfigurationPropertiesForCluster(cluster, "storm-site", newStormProps, true, false);
+ }
+ }
}
protected void updateAlerts() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/195a3595/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
index f33a31d..d6d51a9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
@@ -78,19 +78,21 @@ public class UpgradeCatalog222Test {
public void testExecuteDMLUpdates() throws Exception {
Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
Method updateAlerts = UpgradeCatalog222.class.getDeclaredMethod("updateAlerts");
-
+ Method updateStormConfigs = UpgradeCatalog222.class.getDeclaredMethod("updateStormConfigs");
UpgradeCatalog222 upgradeCatalog222 = createMockBuilder(UpgradeCatalog222.class)
.addMockedMethod(addNewConfigurationsFromXml)
.addMockedMethod(updateAlerts)
+ .addMockedMethod(updateStormConfigs)
.createMock();
upgradeCatalog222.addNewConfigurationsFromXml();
expectLastCall().once();
upgradeCatalog222.updateAlerts();
expectLastCall().once();
-
+ upgradeCatalog222.updateStormConfigs();
+ expectLastCall().once();
replay(upgradeCatalog222);