svn commit: r1052080 - in /incubator/whirr/trunk: CHANGES.txt services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java

[to...@apache.org]

Author: tomwhite
Date: Wed Dec 22 21:58:47 2010
New Revision: 1052080

URL: http://svn.apache.org/viewvc?rev=1052080&view=rev
Log:
WHIRR-175. ZooKeeper service does not honor instance roles. Contributed by Lars George.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1052080&r1=1052079&r2=1052080&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Wed Dec 22 21:58:47 2010
@@ -59,6 +59,9 @@ Trunk (unreleased changes)
     WHIRR-162. DnsUtilTest fails when offline or for slow connections.
     (Andrei Savu via tomwhite)
 
+    WHIRR-175. ZooKeeper service does not honor instance roles.
+    (Lars George via tomwhite)
+
 Release 0.2.0 - 2010-11-04
 
   NEW FEATURES

Modified: incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java?rev=1052080&r1=1052079&r2=1052080&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java Wed Dec 22 21:58:47 2010
@@ -31,6 +31,7 @@ import org.apache.whirr.service.ClusterA
 import org.apache.whirr.service.ClusterActionHandlerSupport;
 import org.apache.whirr.service.ClusterSpec;
 import org.apache.whirr.service.ComputeServiceContextBuilder;
+import org.apache.whirr.service.RolePredicates;
 import org.apache.whirr.service.jclouds.FirewallSettings;
 import org.jclouds.compute.ComputeServiceContext;
 import org.slf4j.Logger;
@@ -67,7 +68,8 @@ public class ZooKeeperClusterActionHandl
     
     // Pass list of all servers in ensemble to configure script.
     // Position is significant: i-th server has id i.
-    String servers = Joiner.on(' ').join(getPrivateIps(cluster.getInstances()));
+    String servers = Joiner.on(' ').join(getPrivateIps(cluster.getInstancesMatching(
+      RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE))));
     addRunUrl(event, "apache/zookeeper/post-configure", "-c",
         clusterSpec.getProvider(),
         servers);
@@ -78,7 +80,8 @@ public class ZooKeeperClusterActionHandl
     ClusterSpec clusterSpec = event.getClusterSpec();
     Cluster cluster = event.getCluster();
     LOG.info("Completed configuration of {}", clusterSpec.getClusterName());
-    String hosts = Joiner.on(',').join(getHosts(cluster.getInstances()));
+    String hosts = Joiner.on(',').join(getHosts(cluster.getInstancesMatching(
+      RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE))));
     LOG.info("Hosts: {}", hosts);
   }