Repository: incubator-brooklyn Updated Branches: refs/heads/master b5404f52a -> 584edcb5c
Add URI enricher for Riak cluster Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/508f9567 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/508f9567 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/508f9567 Branch: refs/heads/master Commit: 508f9567ca186db471abac8181084e7e71d65ba3 Parents: 4c8840e Author: Andrew Kennedy <[email protected]> Authored: Thu Mar 26 12:02:37 2015 +0000 Committer: Andrew Kennedy <[email protected]> Committed: Thu Mar 26 12:04:15 2015 +0000 ---------------------------------------------------------------------- .../entity/nosql/riak/RiakClusterImpl.java | 18 ++++++++++++++++-- .../java/brooklyn/entity/nosql/riak/RiakNode.java | 8 -------- 2 files changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/508f9567/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java index 0e651ea..fcdb79c 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakClusterImpl.java @@ -20,6 +20,7 @@ package brooklyn.entity.nosql.riak; import static brooklyn.util.JavaGroovyEquivalents.groovyTruth; +import java.net.URI; import java.util.Collection; import java.util.List; import java.util.Map; @@ -27,6 +28,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import brooklyn.enricher.Enrichers; import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; @@ -40,11 +42,11 @@ import brooklyn.entity.group.DynamicClusterImpl; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -import brooklyn.management.Task; +import brooklyn.policy.EnricherSpec; import brooklyn.policy.PolicySpec; -import brooklyn.util.time.Duration; import brooklyn.util.time.Time; +import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -98,6 +100,18 @@ public class RiakClusterImpl extends DynamicClusterImpl implements RiakCluster { .displayName("Controller targets tracker") .configure("sensorsToTrack", ImmutableSet.of(RiakNode.SERVICE_UP)) .configure("group", this)); + + EnricherSpec<?> first = Enrichers.builder() + .aggregating(Attributes.MAIN_URI) + .publishing(Attributes.MAIN_URI) + .computing(new Function<Collection<URI>,URI>() { + @Override + public URI apply(Collection<URI> input) { + return input.iterator().next(); + } }) + .fromMembers() + .build(); + addEnricher(first); } protected void onServerPoolMemberChanged(final Entity member) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/508f9567/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java index 7a36e64..6b76a81 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java @@ -30,10 +30,8 @@ import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.proxying.ImplementedBy; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.AttributeSensorAndConfigKey; -import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.basic.Sensors; -import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableList; @@ -159,12 +157,6 @@ public interface RiakNode extends SoftwareProcess { RIAK_SEARCH_QUERY_LATENCY_MEDIAN, RIAK_SEARCH_INDEX_LATENCY_MEDIAN, RIAK_CONSISTENT_GET_TIME_MEAN, RIAK_CONSISTENT_PUT_TIME_MEAN); - ConfigKey<Boolean> DO_OS_TUNING = new BasicConfigKey<Boolean>( - Boolean.class, - "do.os.tunning", - "Does sysctl OS optimizations. By default it is true", - true); - // accessors, for use from template file Integer getRiakWebPort();
