Increased startup delay to five minutes (300 seconds) - Added the 'startTimeout' flag and config key to each entity interface; is this really required?
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/9cbbe5eb Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/9cbbe5eb Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/9cbbe5eb Branch: refs/heads/0.5.0 Commit: 9cbbe5ebc68aac406ab9cb3c3e6756e4afe64af5 Parents: df84b66 Author: Andrew Kennedy <[email protected]> Authored: Thu Mar 21 03:02:38 2013 +0000 Committer: Andrew Kennedy <[email protected]> Committed: Fri Apr 19 10:36:07 2013 +0100 ---------------------------------------------------------------------- .../main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java | 3 +++ .../java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java | 4 ++++ .../main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java | 4 ++++ .../java/brooklyn/entity/messaging/kafka/KafkaZookeeper.java | 3 +++ .../brooklyn/entity/messaging/kafka/KafkaZookeeperImpl.java | 5 +++++ 5 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9cbbe5eb/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java index 33cb7e0..e17f0de 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBroker.java @@ -31,6 +31,9 @@ import brooklyn.util.flags.SetFromFlag; @ImplementedBy(KafkaBrokerImpl.class) public interface KafkaBroker extends SoftwareProcess, MessageBroker, UsesJmx, Kafka { + @SetFromFlag("startTimeout") + public static final ConfigKey<Integer> START_TIMEOUT = SoftwareProcess.START_TIMEOUT; + @SetFromFlag("version") BasicConfigKey<String> SUGGESTED_VERSION = Kafka.SUGGESTED_VERSION; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9cbbe5eb/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java index 4dd253e..0dedf9c 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java @@ -92,6 +92,10 @@ public class KafkaBrokerImpl extends SoftwareProcessImpl implements MessageBroke private volatile FunctionFeed functionFeed; private volatile JmxFeed jmxFeed; + /** Wait for five minutes to start. */ + @Override + public void waitForServiceUp() { waitForServiceUp(5, TimeUnit.MINUTES); } + @Override public void waitForServiceUp(long duration, TimeUnit units) { super.waitForServiceUp(duration, units); http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9cbbe5eb/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java index 45843f3..65ed272 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaCluster.java @@ -20,6 +20,7 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.ConfigurableEntityFactory; +import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.group.Cluster; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.proxying.BasicEntitySpec; @@ -89,6 +90,9 @@ public interface KafkaCluster extends Entity, Startable, Resizable { } } + @SetFromFlag("startTimeout") + public static final ConfigKey<Integer> START_TIMEOUT = ConfigKeys.START_TIMEOUT; + @SetFromFlag("initialSize") public static ConfigKey<Integer> INITIAL_SIZE = new BasicConfigKey<Integer>(Cluster.INITIAL_SIZE, 1); http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9cbbe5eb/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeper.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeper.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeper.java index a1001f3..522828f 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeper.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeper.java @@ -29,6 +29,9 @@ import brooklyn.util.flags.SetFromFlag; @ImplementedBy(KafkaZookeeperImpl.class) public interface KafkaZookeeper extends SoftwareProcess, UsesJmx, Kafka { + @SetFromFlag("startTimeout") + public static final ConfigKey<Integer> START_TIMEOUT = SoftwareProcess.START_TIMEOUT; + @SetFromFlag("version") BasicConfigKey<String> SUGGESTED_VERSION = Kafka.SUGGESTED_VERSION; http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/9cbbe5eb/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeperImpl.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeperImpl.java b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeperImpl.java index 0554011..00f892b 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeperImpl.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/kafka/KafkaZookeeperImpl.java @@ -39,6 +39,7 @@ import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Functions; import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; /** @@ -75,6 +76,10 @@ public class KafkaZookeeperImpl extends SoftwareProcessImpl implements KafkaZook private volatile FunctionFeed functionFeed; private volatile JmxFeed jmxFeed; + /** Wait for five minutes to start. */ + @Override + public void waitForServiceUp() { waitForServiceUp(5, TimeUnit.MINUTES); } + @Override public void waitForServiceUp(long duration, TimeUnit units) { super.waitForServiceUp(duration, units);
