svn commit: r1372170 - in /whirr/branches/branch-0.7: CHANGES.txt services/yarn/src/main/java/org/apache/whirr/service/yarn/YarnNodeManagerHandler.java

[abayer]

Author: abayer
Date: Sun Aug 12 18:45:10 2012
New Revision: 1372170

URL: http://svn.apache.org/viewvc?rev=1372170&view=rev
Log:
WHIRR-616. Allow multiple YARN node managers on a cluster. Contributed by 
Godwin Babu.

Modified:
    whirr/branches/branch-0.7/CHANGES.txt
    
whirr/branches/branch-0.7/services/yarn/src/main/java/org/apache/whirr/service/yarn/YarnNodeManagerHandler.java

Modified: whirr/branches/branch-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/CHANGES.txt?rev=1372170&r1=1372169&r2=1372170&view=diff
==============================================================================
--- whirr/branches/branch-0.7/CHANGES.txt (original)
+++ whirr/branches/branch-0.7/CHANGES.txt Sun Aug 12 18:45:10 2012
@@ -10,6 +10,10 @@ Release 0.7.2
 
   IMPROVEMENTS
 
+    WHIRR-616. Allow multiple YARN node managers to run on a cluster (Godwin 
Babu via abayer)
+
+    WHIRR-617. Use permanently valid ZooKeeper download link and bump to 
3.3.6. (abayer)
+
     WHIRR-585. bin/whirr version command does not work (frankscholten)
 
     WHIRR-457. Upgrade to jclouds 1.2.2 (Andrei Savu)

Modified: 
whirr/branches/branch-0.7/services/yarn/src/main/java/org/apache/whirr/service/yarn/YarnNodeManagerHandler.java
URL: 
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/yarn/src/main/java/org/apache/whirr/service/yarn/YarnNodeManagerHandler.java?rev=1372170&r1=1372169&r2=1372170&view=diff
==============================================================================
--- 
whirr/branches/branch-0.7/services/yarn/src/main/java/org/apache/whirr/service/yarn/YarnNodeManagerHandler.java
 (original)
+++ 
whirr/branches/branch-0.7/services/yarn/src/main/java/org/apache/whirr/service/yarn/YarnNodeManagerHandler.java
 Sun Aug 12 18:45:10 2012
@@ -23,6 +23,7 @@ import static org.apache.whirr.service.y
 import static org.jclouds.scriptbuilder.domain.Statements.call;
 
 import java.io.IOException;
+import java.util.Set;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
@@ -50,13 +51,17 @@ public class YarnNodeManagerHandler exte
     Configuration conf = getConfiguration(clusterSpec);
     Cluster cluster = event.getCluster();
     
-    Instance nodeManager = cluster.getInstanceMatching(role(ROLE));
-    event.getFirewallManager().addRules(
-        Rule.create()
-          .destination(nodeManager)
-          .ports(NODE_MANAGER_WEB_UI_PORT)
-    );
-    
+    Set<Instance> nodeManagers = cluster.getInstancesMatching(role(ROLE));
+    if (!nodeManagers.isEmpty()) {
+        for(Instance nodeManager : nodeManagers) {
+            event.getFirewallManager().addRules(
+                    Rule.create()
+                      .destination(nodeManager)
+                      .ports(NODE_MANAGER_WEB_UI_PORT)
+                );            
+        }
+    }
+        
     try {
       event.getStatementBuilder().addStatements(
         build("/tmp/yarn-site.xml", clusterSpec, cluster, ROLE)