AMBARI-22228 - Remove Remote Tea Runtime library dependency from Storm binaries (Arun Mahadevan via jonathanhurley)
(cherry picked from commit 52e4d7c96d7f3cc4b46feaa481092e3334786fe7) Change-Id: I4f13918f6b2d2e23938295cd199b7dd30add7e2b Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1d9f444 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1d9f444 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1d9f444 Branch: refs/heads/AMBARI-2.6.0.0 Commit: a1d9f44417ccba0c3eda272631bb410fd515b73f Parents: 31b1cc3 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Wed Oct 18 16:54:16 2017 -0400 Committer: Zuul <rel...@hortonworks.com> Committed: Wed Oct 18 19:34:46 2017 -0700 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +++++ .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 3 +++ .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 4 ++++ .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 3 +++ .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 2 +- .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 5 ++++- .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 3 +++ .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.6/services/STORM/configuration/storm-site.xml | 6 +++--- .../main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 4 ++++ .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++ .../src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + 13 files changed, 37 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index 2ac60ff..f69d6f9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -669,6 +669,11 @@ <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common" if-key="authorizer.class.name" if-key-state="present"/> </definition> + <definition xsi:type="configure" id="storm_remove_jmxetric" summary="Removing jmxetric from childopts."> + <type>storm-site</type> + <regex-replace key="content" find=" -javaagent:.*JVM" replace-with=""/> + </definition> + </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml index 4e94536..3d0d906 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml @@ -675,6 +675,9 @@ <summary>Update Storm log directory in storm worker log4j</summary> </task> </execute-stage> + <execute-stage service="STORM" component="NIMBUS" title="Removing jmxetric from childopts"> + <task xsi:type="configure" id="storm_remove_jmxetric"/> + </execute-stage> <!--ATLAS--> <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Parameterizing Atlas Log4J Properties"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml index 48f86e4..3e044ec 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml @@ -1132,6 +1132,7 @@ <task xsi:type="configure" id="storm_cluster_log4j_parameterize" /> <task xsi:type="configure" id="storm_worker_log4j_directory" /> <task xsi:type="configure" id="storm_nimbus_autocred_config" /> + <task xsi:type="configure" id="storm_remove_jmxetric"/> </pre-upgrade> <pre-downgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index 1ae77c3..ed0a44e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -488,6 +488,10 @@ <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common" if-key="authorizer.class.name" if-key-state="present"/> </definition> + <definition xsi:type="configure" id="storm_remove_jmxetric" summary="Removing jmxetric from childopts."> + <type>storm-site</type> + <regex-replace key="content" find=" -javaagent:.*JVM" replace-with=""/> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml index 23b2368..c698d5e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml @@ -595,6 +595,9 @@ <summary>Update Storm log directory in storm worker log4j</summary> </task> </execute-stage> + <execute-stage service="STORM" component="NIMBUS" title="Removing jmxetric from childopts"> + <task xsi:type="configure" id="storm_remove_jmxetric"/> + </execute-stage> <!-- KAFKA --> <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Apply config changes for Kafka Broker"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml index 365e17a..08725f0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml @@ -1094,7 +1094,7 @@ <task xsi:type="configure" id="storm_cluster_log4j_parameterize" /> <task xsi:type="configure" id="storm_worker_log4j_directory" /> <task xsi:type="configure" id="storm_nimbus_autocred_config" /> - + <task xsi:type="configure" id="storm_remove_jmxetric"/> </pre-upgrade> <pre-downgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml index cf73a88..988b60f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml @@ -69,7 +69,10 @@ <set key="nimbus.credential.renewers.classes" value="['org.apache.storm.hdfs.security.AutoHDFS', 'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common" if-key="authorizer.class.name" if-key-state="present"/> <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common" if-key="authorizer.class.name" if-key-state="present"/> </definition> - + <definition xsi:type="configure" id="storm_remove_jmxetric" summary="Removing jmxetric from childopts."> + <type>storm-site</type> + <regex-replace key="content" find=" -javaagent:.*JVM" replace-with=""/> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index 3955276..48be5d1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -526,6 +526,9 @@ <summary>Updating the Storm cluster Log4J properties to include parameterizations</summary> </task> </execute-stage> + <execute-stage service="STORM" component="NIMBUS" title="Removing jmxetric from childopts"> + <task xsi:type="configure" id="storm_remove_jmxetric"/> + </execute-stage> <!-- PIG --> <execute-stage service="PIG" component="PIG" title="Apply config changes for Pig"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index 61bd9e9..f64d2b4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -1050,6 +1050,7 @@ <task xsi:type="configure" id="storm_worker_log4j_parameterize" /> <task xsi:type="configure" id="storm_cluster_log4j_parameterize" /> <task xsi:type="configure" id="storm_nimbus_autocred_config" /> + <task xsi:type="configure" id="storm_remove_jmxetric"/> </pre-upgrade> <pre-downgrade/> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/configuration/storm-site.xml index 902fdc9..74262b6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/STORM/configuration/storm-site.xml @@ -29,7 +29,7 @@ </property> <property> <name>nimbus.childopts</name> - <value>-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</value> + <value>-Xmx1024m _JAAS_PLACEHOLDER</value> <description>This parameter is used by the storm-deploy project to configure the jvm options for the nimbus daemon.</description> <value-attributes> <overridable>false</overridable> @@ -38,7 +38,7 @@ </property> <property> <name>worker.childopts</name> - <value>-Xmx768m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-client/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-client/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value> + <value>-Xmx768m _JAAS_PLACEHOLDER</value> <description>The jvm opts provided to workers launched by this supervisor. All \"%ID%\" substrings are replaced with an identifier for this worker.</description> <value-attributes> <type>multiLine</type> @@ -47,7 +47,7 @@ </property> <property> <name>supervisor.childopts</name> - <value>-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</value> + <value>-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}}</value> <description>This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.</description> <value-attributes> <overridable>false</overridable> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml index edc8298..ea90e0b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml @@ -138,6 +138,10 @@ <set key="nimbus.credential.renewers.classes" value="['org.apache.storm.hdfs.security.AutoHDFS', 'org.apache.storm.hbase.security.AutoHBase', 'org.apache.storm.hive.security.AutoHive']" if-type="streamline-common" if-key="authorizer.class.name" if-key-state="present"/> <set key="nimbus.credential.renewers.freq.secs" value="82800" if-type="streamline-common" if-key="authorizer.class.name" if-key-state="present"/> </definition> + <definition xsi:type="configure" id="storm_remove_jmxetric" summary="Removing jmxetric from childopts."> + <type>storm-site</type> + <regex-replace key="content" find=" -javaagent:.*JVM" replace-with=""/> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml index 728bd42..b4e3745 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml @@ -336,6 +336,10 @@ <task xsi:type="configure" id="storm_nimbus_autocred_config"/> </execute-stage> + <execute-stage service="STORM" component="NIMBUS" title="Removing jmxetric from childopts"> + <task xsi:type="configure" id="storm_remove_jmxetric"/> + </execute-stage> + <!-- YARN --> <execute-stage service="YARN" component="RESOURCEMANAGER" title="Apply config changes for Ranger Yarn plugin"> <task xsi:type="configure" id="hdp_2_6_maint_ranger_yarn_plugin_cluster_name"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d9f444/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml index a1279e3..21b1538 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml @@ -979,6 +979,7 @@ <pre-upgrade> <task xsi:type="configure" id="hdp_2_6_maint_ranger_storm_plugin_cluster_name"/> <task xsi:type="configure" id="storm_nimbus_autocred_config"/> + <task xsi:type="configure" id="storm_remove_jmxetric"/> </pre-upgrade> <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> <upgrade>
