You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/04/27 13:44:28 UTC

[1/2] brooklyn-library git commit: Zookeeper now uses subnet for leadership election

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 <gr...@cloudsoftcorp.com>
Authored: Thu Apr 27 13:24:59 2017 +0100
Committer: graeme.miller <gr...@cloudsoftcorp.com>
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();


[2/2] brooklyn-library git commit: This closes #104

Posted by dr...@apache.org.
This closes #104


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

Branch: refs/heads/master
Commit: eb11975bc14f9fcf6f3ee11f2b89290b41a29332
Parents: 3e0a252 c534240
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Thu Apr 27 14:44:21 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Thu Apr 27 14:44:21 2017 +0100

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