You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2017/10/24 20:14:35 UTC
[14/50] [abbrv] ambari git commit: AMBARI-22286 - Remove jmxetric
configs from storm-site childopts during upgrade (Arun Mahadevan via
jonathanhurley)
AMBARI-22286 - Remove jmxetric configs from storm-site childopts during upgrade (Arun Mahadevan via jonathanhurley)
(cherry picked from commit fa6cd7ef0c8a5425c656fc2ca4794799b49f38a0)
Change-Id: Ibffa28481fb3eb72219e68f66c053487918e1196
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4893d55f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4893d55f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4893d55f
Branch: refs/heads/AMBARI-2.6.0.0
Commit: 4893d55f7f799c25a7b3af696faf11fd86f89610
Parents: 1ba7a54
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Oct 23 09:42:08 2017 -0400
Committer: jhurley@hortonworks.com <je...@hortonworks.com>
Committed: Mon Oct 23 13:59:19 2017 +0000
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml | 4 +++-
.../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 4 +++-
.../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 4 +++-
.../main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4893d55f/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 f69d6f9..09422cb 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
@@ -671,7 +671,9 @@
<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=""/>
+ <regex-replace key="nimbus.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="supervisor.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="worker.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
</definition>
</changes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4893d55f/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 ed0a44e..813e3ae 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
@@ -490,7 +490,9 @@
<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=""/>
+ <regex-replace key="nimbus.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="supervisor.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="worker.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
</definition>
</changes>
</component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4893d55f/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 988b60f..d7194cc 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
@@ -71,7 +71,9 @@
</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=""/>
+ <regex-replace key="nimbus.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="supervisor.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="worker.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
</definition>
</changes>
</component>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4893d55f/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 ea90e0b..0df0334 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
@@ -140,7 +140,9 @@
</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=""/>
+ <regex-replace key="nimbus.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="supervisor.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
+ <regex-replace key="worker.childopts" find=" -javaagent:(.*)JVM" replace-with=""/>
</definition>
</changes>
</component>