You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/10/31 13:41:22 UTC
[1/2] brooklyn-library git commit: Update default Zookeeper version
and fix NPE on customize phase,
caused by the ZookeeperNode.MY_ID and getZookeeperServers() when used to
deploy only one node
Repository: brooklyn-library
Updated Branches:
refs/heads/master c1dc94aa6 -> 8a57ff78d
Update default Zookeeper version and fix NPE on customize phase, caused by the ZookeeperNode.MY_ID and getZookeeperServers() when used to deploy only one node
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/bea36b1e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/bea36b1e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/bea36b1e
Branch: refs/heads/master
Commit: bea36b1ee81a31e2f49e7998c35ce684a5b1e662
Parents: 1db9b4f
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Fri Oct 28 09:18:45 2016 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Fri Oct 28 15:20:32 2016 +0100
----------------------------------------------------------------------
.../entity/zookeeper/ZooKeeperNode.java | 2 +-
.../entity/zookeeper/ZooKeeperNodeImpl.java | 5 +++++
.../entity/zookeeper/ZooKeeperSshDriver.java | 20 ++++++++++++--------
3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/bea36b1e/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java
index 0dce3b7..e0644df 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNode.java
@@ -38,7 +38,7 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag;
public interface ZooKeeperNode extends SoftwareProcess {
@SetFromFlag("version")
- ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "3.4.5");
+ ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "3.4.9");
@SetFromFlag("archiveNameFormat")
ConfigKey<String> ARCHIVE_DIRECTORY_NAME_FORMAT = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.ARCHIVE_DIRECTORY_NAME_FORMAT, "zookeeper-%s");
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/bea36b1e/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java
index 275e101..f0eee04 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperNodeImpl.java
@@ -30,4 +30,9 @@ public class ZooKeeperNodeImpl extends AbstractZooKeeperImpl implements ZooKeepe
return ZooKeeperDriver.class;
}
+ @Override
+ public void init() {
+ super.init();
+ sensors().set(ZooKeeperNode.MY_ID, 1);
+ }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/bea36b1e/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
index 87bf3ff..e4ed338 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java
@@ -62,17 +62,21 @@ public class ZooKeeperSshDriver extends JavaSoftwareProcessSshDriver implements
// Need a way to terminate the wait based on the entity going on-fire etc.
// FIXME Race in getMemebers. Should we change DynamicCluster.grow to create the members and only then call start on them all?
public List<ZooKeeperServerConfig> getZookeeperServers() throws ExecutionException, InterruptedException {
- ZooKeeperEnsemble ensemble = (ZooKeeperEnsemble) entity.getParent();
List<ZooKeeperServerConfig> result = Lists.newArrayList();
- for (Entity member : ensemble.getMembers()) {
- Integer myid = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.MY_ID).get();
- String hostname = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.HOSTNAME).get();
- Integer port = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.ZOOKEEPER_PORT).get();
- Integer leaderPort = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.ZOOKEEPER_LEADER_PORT).get();
- Integer electionPort = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.ZOOKEEPER_ELECTION_PORT).get();
- result.add(new ZooKeeperServerConfig(myid, hostname, port, leaderPort, electionPort));
+ if (entity.getParent().getClass().isAssignableFrom(ZooKeeperEnsemble.class)) {
+ ZooKeeperEnsemble ensemble = (ZooKeeperEnsemble) entity.getParent();
+
+ for (Entity member : ensemble.getMembers()) {
+ Integer myid = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.MY_ID).get();
+ String hostname = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.HOSTNAME).get();
+ Integer port = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.ZOOKEEPER_PORT).get();
+ Integer leaderPort = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.ZOOKEEPER_LEADER_PORT).get();
+ Integer electionPort = Entities.attributeSupplierWhenReady(member, ZooKeeperNode.ZOOKEEPER_ELECTION_PORT).get();
+ result.add(new ZooKeeperServerConfig(myid, hostname, port, leaderPort, electionPort));
+ }
}
+
return result;
}
[2/2] brooklyn-library git commit: Closes #69
Posted by sv...@apache.org.
Closes #69
Update default Zookeeper version and fix NPE
This updates the Zookeeper version to use (version 3.4.5 not available anymore).
It also fixes a NPE on customize phase, caused by:
- the `ZookeeperNode.MY_ID` not set for a single `ZookeeperNode`
- getZookeeperServers() expecting the parent to be and entity of type `ZookeeperEnsemble`, which is not the case for a single `ZookeeperNode`
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/8a57ff78
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/8a57ff78
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/8a57ff78
Branch: refs/heads/master
Commit: 8a57ff78d1944fc16c36c2423bbb6e36a2e55a24
Parents: c1dc94a bea36b1
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Oct 31 15:41:13 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Oct 31 15:41:13 2016 +0200
----------------------------------------------------------------------
.../entity/zookeeper/ZooKeeperNode.java | 2 +-
.../entity/zookeeper/ZooKeeperNodeImpl.java | 5 +++++
.../entity/zookeeper/ZooKeeperSshDriver.java | 20 ++++++++++++--------
3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------