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

[as...@apache.org]

Author: asavu
Date: Tue Mar 22 15:49:31 2011
New Revision: 1084224

URL: http://svn.apache.org/viewvc?rev=1084224&view=rev
Log:
WHIRR-253. ZooKeeper service should only authorize ingress to ZooKeeper instances (tomwhite via asavu)

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=1084224&r1=1084223&r2=1084224&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Tue Mar 22 15:49:31 2011
@@ -2,6 +2,11 @@ Apache Whirr Change Log
 
 Trunk (unreleased changes)
 
+  BUG FIXES
+
+    WHIRR-253. ZooKeeper service should only authorize ingress to ZooKeeper 
+    instances (tomwhite via asavu)
+
 Release 0.4.0 - 2011-03-15
 
   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=1084224&r1=1084223&r2=1084224&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 Tue Mar 22 15:49:31 2011
@@ -18,6 +18,7 @@ package org.apache.whirr.service.zookeep
  */
 
 import static org.jclouds.scriptbuilder.domain.Statements.call;
+import static org.apache.whirr.service.RolePredicates.role;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -33,7 +34,6 @@ 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;
@@ -63,16 +63,16 @@ public class ZooKeeperClusterActionHandl
   protected void beforeConfigure(ClusterActionEvent event) throws IOException, InterruptedException {
     ClusterSpec clusterSpec = event.getClusterSpec();
     Cluster cluster = event.getCluster();
+    Set<Instance> ensemble = cluster.getInstancesMatching(role(ZOOKEEPER_ROLE));
     LOG.info("Authorizing firewall");
     ComputeServiceContext computeServiceContext =
       ComputeServiceContextBuilder.build(clusterSpec);
     FirewallSettings.authorizeIngress(computeServiceContext,
-        cluster.getInstances(), clusterSpec, CLIENT_PORT);
+        ensemble, clusterSpec, CLIENT_PORT);
     
     // 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.getInstancesMatching(
-      RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE))));
+    String servers = Joiner.on(' ').join(getPrivateIps(ensemble));
     addStatement(event, call("configure_zookeeper", "-c",
         clusterSpec.getProvider(), servers));
   }
@@ -83,7 +83,7 @@ public class ZooKeeperClusterActionHandl
     Cluster cluster = event.getCluster();
     LOG.info("Completed configuration of {}", clusterSpec.getClusterName());
     String hosts = Joiner.on(',').join(getHosts(cluster.getInstancesMatching(
-      RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE))));
+      role(ZOOKEEPER_ROLE))));
     LOG.info("Hosts: {}", hosts);
   }