Repository: brooklyn-library
Updated Branches:
  refs/heads/master 3e0a252dc -> eb11975bc


Zookeeper now uses subnet for leadership election


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

Branch: refs/heads/master
Commit: c5342409822e21efdf7a65c52ad1dc4a57ea8a30
Parents: 7abc83f
Author: graeme.miller <[email protected]>
Authored: Thu Apr 27 13:24:59 2017 +0100
Committer: graeme.miller <[email protected]>
Committed: Thu Apr 27 13:24:59 2017 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/entity/zookeeper/ZooKeeperSshDriver.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c5342409/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 c7b1dc9..ecd9bf7 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
@@ -72,7 +72,7 @@ public class ZooKeeperSshDriver extends 
JavaSoftwareProcessSshDriver implements
                 if (memberId == null) {
                     throw new IllegalStateException(member + " has null value 
for " + ZooKeeperNode.MY_ID);
                 }
-                String hostname = Entities.attributeSupplierWhenReady(member, 
ZooKeeperNode.HOSTNAME).get();
+                String hostname = Entities.attributeSupplierWhenReady(member, 
ZooKeeperNode.SUBNET_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();

Reply via email to