brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/2] brooklyn-library git commit: Fix KafkaZooKeeper archive directory name format
Date Fri, 25 Mar 2016 00:39:37 GMT
Repository: brooklyn-library
Updated Branches:
  refs/heads/master 51f715b52 -> 3216b7a42


Fix KafkaZooKeeper archive directory name format


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/e34382e6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/e34382e6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/e34382e6

Branch: refs/heads/master
Commit: e34382e6a660b82e66490e73ccc63327cf17d5a8
Parents: 8a23940
Author: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Authored: Tue Mar 22 11:55:16 2016 +0000
Committer: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Committed: Tue Mar 22 11:55:16 2016 +0000

----------------------------------------------------------------------
 .../brooklyn/entity/messaging/kafka/KafkaZooKeeper.java      | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/e34382e6/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
index 5aee6d2..aef59eb 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
@@ -23,6 +23,7 @@ import org.apache.brooklyn.config.ConfigKey;
 import org.apache.brooklyn.core.annotation.Effector;
 import org.apache.brooklyn.core.annotation.EffectorParam;
 import org.apache.brooklyn.core.config.BasicConfigKey;
+import org.apache.brooklyn.core.config.ConfigKeys;
 import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey;
 import org.apache.brooklyn.entity.software.base.SoftwareProcess;
 import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode;
@@ -52,6 +53,13 @@ public interface KafkaZooKeeper extends ZooKeeperNode, Kafka {
             "kafka.zookeeper.configTemplate", "Kafka zookeeper configuration template (in
freemarker format)",
             "classpath://org/apache/brooklyn/entity/messaging/kafka/zookeeper.properties");
 
+    // This is defined by both ZooKeeperNode ("zookeeper-%s") and Kafka ("kafka_%s").
+    // The latter is correct.
+    @SetFromFlag("archiveNameFormat")
+    ConfigKey<String> ARCHIVE_DIRECTORY_NAME_FORMAT = ConfigKeys.newConfigKeyWithDefault(
+            SoftwareProcess.ARCHIVE_DIRECTORY_NAME_FORMAT,
+            "kafka_%s");
+
     @Effector(description = "Create a topic with a single partition and only one replica")
     void createTopic(@EffectorParam(name = "topic") String topic);
 }


Mime
View raw message