You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/09/28 19:38:53 UTC
ambari git commit: AMBARI-13260. Storm service check fails after
manual stack upgrade. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1.2 6fa66c2c8 -> 5f7b5e938
AMBARI-13260. Storm service check fails after manual stack upgrade. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5f7b5e93
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5f7b5e93
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5f7b5e93
Branch: refs/heads/branch-2.1.2
Commit: 5f7b5e93858e88de46583a99c6b818d1363f9251
Parents: 6fa66c2
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Mon Sep 28 20:34:36 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Mon Sep 28 20:35:27 2015 +0300
----------------------------------------------------------------------
.../upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5f7b5e93/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
index 250f5b2..422b86b 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.3.json
@@ -47,10 +47,19 @@
},
"storm-site":{
"merged-copy": "yes"
+ },
+ "storm-env": {
+ "merged-copy": "yes",
+ "required-services": [
+ "STORM"
+ ]
}
}
},
"properties": {
+ "storm-env": {
+ "nimbus_seeds_supported": "true"
+ },
"storm-site": {
"supervisor.childopts": "-Xmx256m _JAAS_PLACEHOLDER -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port={{jmxremote_port}} -javaagent:/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"nimbus.childopts": "-Xmx1024m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",