ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject ambari git commit: AMBARI-22286 - Remove jmxetric configs from storm-site childopts during upgrade (Arun Mahadevan via jonathanhurley)
Date Mon, 23 Oct 2017 14:08:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 512c941b7 -> cfd0f090b


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/cfd0f090
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cfd0f090
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cfd0f090

Branch: refs/heads/trunk
Commit: cfd0f090b3a6f448fe3f07d583693aac4af1194b
Parents: 512c941
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Mon Oct 23 10:08:47 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Mon Oct 23 10:08:47 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/cfd0f090/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 c4a5b95..2324673 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
@@ -662,7 +662,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/cfd0f090/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 64121a4..efb997a 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
@@ -483,7 +483,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/cfd0f090/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 d138d60..b1e5f91 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/cfd0f090/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 647bdeb..63624d6 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
@@ -134,7 +134,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>


Mime
View raw message