Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E2F0C1110C for ; Fri, 1 Aug 2014 16:47:57 +0000 (UTC) Received: (qmail 69746 invoked by uid 500); 1 Aug 2014 16:47:57 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 69721 invoked by uid 500); 1 Aug 2014 16:47:57 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 69707 invoked by uid 99); 1 Aug 2014 16:47:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 16:47:57 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 01 Aug 2014 16:47:56 +0000 Received: (qmail 68475 invoked by uid 99); 1 Aug 2014 16:47:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 16:47:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DF2B29BD971; Fri, 1 Aug 2014 16:47:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.incubator.apache.org Date: Fri, 01 Aug 2014 16:47:40 -0000 Message-Id: <85d0ce6d39af413ea7a64103bc53c717@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/9] git commit: explicitly fix two of the instances where enrichers and policies were being added again on rebind X-Virus-Checked: Checked by ClamAV on apache.org explicitly fix two of the instances where enrichers and policies were being added again on rebind Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/51145520 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/51145520 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/51145520 Branch: refs/heads/master Commit: 51145520aced1b20a482f78bde4b43cfa4697b8d Parents: d135df4 Author: Alex Heneveld Authored: Thu Jul 31 02:55:35 2014 -0400 Committer: Alex Heneveld Committed: Thu Jul 31 03:40:09 2014 -0400 ---------------------------------------------------------------------- .../brooklyn/entity/proxy/AbstractControllerImpl.java | 11 ++++++++++- .../brooklyn/entity/webapp/DynamicWebAppClusterImpl.java | 9 +++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51145520/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java index 9542b88..9e0b151 100644 --- a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory; import brooklyn.entity.Entity; import brooklyn.entity.Group; import brooklyn.entity.basic.Entities; -import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.EntityInternal; +import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.basic.SoftwareProcessImpl; import brooklyn.entity.group.AbstractMembershipTrackingPolicy; import brooklyn.entity.group.Cluster; @@ -42,6 +42,7 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.feed.ConfigToAttributes; import brooklyn.location.access.BrooklynAccessUtils; import brooklyn.management.Task; +import brooklyn.policy.Policy; import brooklyn.policy.PolicySpec; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Maybe; @@ -110,6 +111,14 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme LOG.warn("Call to addServerPoolMemberTrackingPolicy when serverPoolMemberTrackingPolicy already exists, in {}", this); removeServerPoolMemberTrackingPolicy(); } + for (Policy p: getPolicies()) { + if (p instanceof ServerPoolMemberTrackerPolicy) { + // TODO want a more elegant idiom for this! + LOG.info(this+" picking up "+p+" as the tracker (already set, often due to rebind)"); + serverPoolMemberTrackerPolicy = (ServerPoolMemberTrackerPolicy) p; + return; + } + } AttributeSensor hostAndPortSensor = getConfig(HOST_AND_PORT_SENSOR); AttributeSensor hostnameSensor = getConfig(HOSTNAME_SENSOR); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/51145520/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java b/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java index 1b40195..bfdc666 100644 --- a/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java @@ -76,7 +76,8 @@ public class DynamicWebAppClusterImpl extends DynamicClusterImpl implements Dyna } @Override - public void onManagementBecomingMaster() { + public void init() { + super.init(); // Enricher attribute setup. A way of automatically discovering these (but avoiding // averaging things like HTTP port and response codes) would be neat. List>> summingEnricherSetup = ImmutableList.of( @@ -120,7 +121,11 @@ public class DynamicWebAppClusterImpl extends DynamicClusterImpl implements Dyna .computingAverage() .build()); } - + } + + public void onManagementStarted() { + super.onManagementStarted(); + subscribeToMembers(this, SERVICE_UP, new SensorEventListener() { @Override public void onEvent(SensorEvent event) { if (!isRebinding()) {