You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/10/05 00:22:26 UTC
[2/4] brooklyn-library git commit: set highlights on
software-specific enrichers and policies
set highlights on software-specific enrichers and policies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/4babb503
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/4babb503
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/4babb503
Branch: refs/heads/master
Commit: 4babb503460bbd938352b603c397214e53a1ef08
Parents: 71a3fd2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 13 17:52:43 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 13 17:52:43 2017 +0100
----------------------------------------------------------------------
.../brooklyn/entity/network/bind/PrefixAndIdEnricher.java | 2 ++
.../nosql/mongodb/sharding/MongoDBRouterClusterImpl.java | 9 +++++++++
.../brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java | 1 +
.../brooklyn/entity/proxy/AbstractControllerImpl.java | 1 +
.../entity/proxy/AbstractNonProvisionedControllerImpl.java | 3 +++
.../brooklyn/entity/proxy/nginx/NginxControllerImpl.java | 1 +
6 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
----------------------------------------------------------------------
diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
index cf03530..87a72e8 100644
--- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
+++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/PrefixAndIdEnricher.java
@@ -37,6 +37,7 @@ public class PrefixAndIdEnricher extends AbstractEnricher {
public static final ConfigKey<String> PREFIX = ConfigKeys.newStringConfigKey(
"prefixandid.prefix", "Sets SENSOR to prefix+entity id");
+ @SuppressWarnings("serial")
public static final ConfigKey<AttributeSensor<?>> MONITOR = ConfigKeys.newConfigKey(new TypeToken<AttributeSensor<?>>() {},
"prefixandid.attributetomonitor", "Changes on this sensor are monitored and the prefix/id republished");
@@ -52,6 +53,7 @@ public class PrefixAndIdEnricher extends AbstractEnricher {
entity.sensors().set(SENSOR, getConfig(PREFIX) + entity.getId());
}
});
+ highlightTriggers(getConfig(MONITOR), null);
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
index 48b501c..ccff4e2 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBRouterClusterImpl.java
@@ -30,12 +30,16 @@ import org.apache.brooklyn.core.entity.EntityPredicates;
import org.apache.brooklyn.core.entity.trait.Startable;
import org.apache.brooklyn.entity.group.AbstractMembershipTrackingPolicy;
import org.apache.brooklyn.entity.group.DynamicClusterImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
public class MongoDBRouterClusterImpl extends DynamicClusterImpl implements MongoDBRouterCluster {
+ private static final Logger log = LoggerFactory.getLogger(MongoDBRouterClusterImpl.class);
+
@Override
public void init() {
super.init();
@@ -56,12 +60,17 @@ public class MongoDBRouterClusterImpl extends DynamicClusterImpl implements Mong
public static class MemberTrackingPolicy extends AbstractMembershipTrackingPolicy {
@Override protected void onEntityEvent(EventType type, Entity member) {
+ defaultHighlightAction(type, entity);
((MongoDBRouterClusterImpl)super.entity).setAnyRouter();
}
@Override protected void onEntityRemoved(Entity member) {
+ // TODO shouldn't be invoked - remove
+ log.warn("Removal handler should be hidden by event handler", new Throwable("Trace for unexpected mongo node handler"));
((MongoDBRouterClusterImpl)super.entity).setAnyRouter();
}
@Override protected void onEntityChange(Entity member) {
+ // TODO shouldn't be invoked - remove
+ log.warn("Change handler should be hidden by event handler", new Throwable("Trace for unexpected mongo node handler"));
((MongoDBRouterClusterImpl)super.entity).setAnyRouter();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
index 0f96c87..d94d551 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceImpl.java
@@ -180,6 +180,7 @@ public abstract class AbstractGeoDnsServiceImpl extends AbstractEntity implement
public static class MemberTrackingPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
((AbstractGeoDnsServiceImpl)super.entity).refreshGroupMembership();
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
index c24b2bc..34c324e 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java
@@ -154,6 +154,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme
public static class ServerPoolMemberTrackerPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
// relies on policy-rebind injecting the implementation rather than the dynamic-proxy
((AbstractControllerImpl)super.entity).onServerPoolMemberChanged(entity);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
index c26235a..7ad7224 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractNonProvisionedControllerImpl.java
@@ -51,6 +51,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
+/** For use by downstream load-balancers. */
public abstract class AbstractNonProvisionedControllerImpl extends AbstractEntity implements AbstractNonProvisionedController {
private static final Logger LOG = LoggerFactory.getLogger(AbstractNonProvisionedControllerImpl.class);
@@ -66,6 +67,7 @@ public abstract class AbstractNonProvisionedControllerImpl extends AbstractEntit
public static class MemberTrackingPolicy extends AbstractMembershipTrackingPolicy {
@Override protected void onEntityEvent(EventType type, Entity member) {
+ defaultHighlightAction(type, entity);
((AbstractNonProvisionedControllerImpl)super.entity).onServerPoolMemberChanged(member);
}
}
@@ -216,6 +218,7 @@ public abstract class AbstractNonProvisionedControllerImpl extends AbstractEntit
public static class ServerPoolMemberTrackerPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
// relies on policy-rebind injecting the implementation rather than the dynamic-proxy
((AbstractNonProvisionedControllerImpl)super.entity).onServerPoolMemberChanged(entity);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4babb503/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
index 7756909..979f915 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
@@ -178,6 +178,7 @@ public class NginxControllerImpl extends AbstractControllerImpl implements Nginx
public static class UrlMappingsMemberTrackerPolicy extends AbstractMembershipTrackingPolicy {
@Override
protected void onEntityEvent(EventType type, Entity entity) {
+ defaultHighlightAction(type, entity);
// relies on policy-rebind injecting the implementation rather than the dynamic-proxy
((NginxControllerImpl)super.entity).updateNeeded();
}