Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3788C17D69 for ; Wed, 1 Apr 2015 14:28:40 +0000 (UTC) Received: (qmail 19184 invoked by uid 500); 1 Apr 2015 14:28:32 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 19163 invoked by uid 500); 1 Apr 2015 14:28:32 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 19154 invoked by uid 99); 1 Apr 2015 14:28:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 14:28:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 01F2AE05DF; Wed, 1 Apr 2015 14:28:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Message-Id: <4eb2a00b1bf04ea2a20dbc6f12ecf481@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-10310. 'Supervisor Process' alert after changing -Dcom.sun.management.jmxremote.port (aonishuk) Date: Wed, 1 Apr 2015 14:28:32 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk eb2cff862 -> ce5cc87c5 AMBARI-10310. 'Supervisor Process' alert after changing -Dcom.sun.management.jmxremote.port (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce5cc87c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce5cc87c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce5cc87c Branch: refs/heads/trunk Commit: ce5cc87c514a5149e7066560cd38072f960a515d Parents: eb2cff8 Author: Andrew Onishuk Authored: Wed Apr 1 17:28:21 2015 +0300 Committer: Andrew Onishuk Committed: Wed Apr 1 17:28:21 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 1 + .../main/resources/common-services/STORM/0.9.1.2.1/alerts.json | 2 +- .../common-services/STORM/0.9.1.2.1/configuration/storm-env.xml | 5 +++++ .../STORM/0.9.1.2.1/configuration/storm-site.xml | 2 +- .../common-services/STORM/0.9.1.2.1/package/scripts/params.py | 1 + .../stacks/HDP/2.2/services/STORM/configuration/storm-site.xml | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5cc87c/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java index ba4dd2d..064f536 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java @@ -329,5 +329,6 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog { */ @Override protected void executeDMLUpdates() throws AmbariException, SQLException { + addNewConfigurationsFromXml(); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5cc87c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json index 6557df9..d6f569b 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json @@ -169,7 +169,7 @@ "enabled": true, "source": { "type": "PORT", - "uri": "56431", + "uri": "{{storm-env/jmxremote_port}}", "default_port": 56431, "reporting": { "ok": { http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5cc87c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml index c663116..d79629a 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml @@ -37,6 +37,11 @@ /var/run/storm + + jmxremote_port + 56431 + + http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5cc87c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml index 5e96fb1..2d7b97a 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml @@ -269,7 +269,7 @@ supervisor.childopts - -Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=56431 -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM + -Xmx256m -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/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon. http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5cc87c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py index 2d575b0..d6e3881 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py @@ -81,6 +81,7 @@ rest_api_port = "8745" rest_api_admin_port = "8746" rest_api_conf_file = format("{conf_dir}/config.yaml") storm_env_sh_template = config['configurations']['storm-env']['content'] +jmxremote_port = config['configurations']['storm-env']['jmxremote_port'] if 'ganglia_server_host' in config['clusterHostInfo'] and \ len(config['clusterHostInfo']['ganglia_server_host'])>0: http://git-wip-us.apache.org/repos/asf/ambari/blob/ce5cc87c/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml index c933099..f894ddd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/storm-site.xml @@ -73,7 +73,7 @@ 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=56431 -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 + -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 This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.