You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/10/23 13:42:17 UTC
ambari git commit: AMBARI-22286 - Remove jmxetric configs from
storm-site childopts during upgrade (Arun Mahadevan via jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 2407b5cab -> fa6cd7ef0
AMBARI-22286 - Remove jmxetric configs from storm-site childopts during upgrade (Arun Mahadevan via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa6cd7ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa6cd7ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa6cd7ef
Branch: refs/heads/branch-2.6
Commit: fa6cd7ef0c8a5425c656fc2ca4794799b49f38a0
Parents: 2407b5c
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Oct 23 09:42:08 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Oct 23 09:42:08 2017 -0400
----------------------------------------------------------------------
.../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/fa6cd7ef/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/fa6cd7ef/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/fa6cd7ef/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/fa6cd7ef/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>