You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/06/23 21:01:54 UTC
ambari git commit: AMBARI-12008 NIMBUS / DRPC_SERVER become stopped
after few minutes after ambari only upgrade from 1.7.0 to 2.1.0 (additional
patch) (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 7acbb8894 -> df1fc98b5
AMBARI-12008 NIMBUS / DRPC_SERVER become stopped after few minutes after ambari only upgrade from 1.7.0 to 2.1.0 (additional patch) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df1fc98b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df1fc98b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df1fc98b
Branch: refs/heads/trunk
Commit: df1fc98b5ce73df2801a98ab6b1a6af0246776b0
Parents: 7acbb88
Author: Dmytro Sen <ds...@apache.org>
Authored: Tue Jun 23 22:00:53 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Tue Jun 23 22:01:03 2015 +0300
----------------------------------------------------------------------
.../apache/ambari/server/upgrade/UpgradeCatalog210.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/df1fc98b/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 36a162f..2f8fc50 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
@@ -1288,6 +1288,18 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
if (!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("java.security.auth.login.config")) {
newStormProps.put("java.security.auth.login.config", "{{conf_dir}}/storm_jaas.conf");
}
+ if (!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("nimbus.admins")) {
+ newStormProps.put("nimbus.admins", "['{{storm_user}}']");
+ }
+ if (!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("nimbus.supervisors.users")) {
+ 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}}");
+ }
+ 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'}");
+ }
updateConfigurationPropertiesForCluster(cluster, "storm-site", newStormProps, false, true);
}
}