[jboss-cvs] JBossAS SVN: r76263 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-07-27 14:08:29 -0400 (Sun, 27 Jul 2008)
New Revision: 76263

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java
Log:
[JBAS-5659] Add method for sending multiple requests; rationalize method names

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java	2008-07-27 18:08:06 UTC (rev 76262)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java	2008-07-27 18:08:29 UTC (rev 76263)
@@ -432,6 +432,7 @@
       return (a == b || (a != null && a.equals(b)));
    }
    
+   @SuppressWarnings("unchecked")
    private void updateClusterStatus()
    {
       this.localHandler.status();
@@ -561,17 +562,15 @@
       // FIXME handle crashed members, gone from DRM
       
       // Advise the proxies of any reset requests
-      for (MCMPRequest resetRequest : resetRequests)
-      {
-         this.localHandler.sendRequest(resetRequest);
-      }
+      this.localHandler.sendRequests(resetRequests);
       
       // Pass along the LBF values
+      List<MCMPRequest> statusRequests = new ArrayList<MCMPRequest>();
       for (Map.Entry<String, Integer> entry : loadBalanceFactors.entrySet())
       {
-         MCMPRequest req = MCMPUtils.createStatusRequest(entry.getKey(), entry.getValue().intValue());
-         this.localHandler.sendRequest(req);
+         statusRequests.add(MCMPUtils.createStatusRequest(entry.getKey(), entry.getValue().intValue()));
       }
+      this.localHandler.sendRequests(statusRequests);
       
       // Advise the members the process is done and that they should update DRM
       notifyClusterStatusComplete(masterList, statuses);      
@@ -593,7 +592,7 @@
       
       if (othersFirst)
       {
-         updateRemoteDRMs(statuses);
+         remoteNotifyClusterStatusComplete(statuses);
          
          if (updated)
          {
@@ -607,15 +606,15 @@
             updateLocalDRM(ourNewStatus);
          }
          
-         updateRemoteDRMs(statuses);
+         remoteNotifyClusterStatusComplete(statuses);
       }
    }
 
-   private void updateRemoteDRMs(Map<ClusterNode, PeerMCMPDiscoveryStatus> statuses)
+   private void remoteNotifyClusterStatusComplete(Map<ClusterNode, PeerMCMPDiscoveryStatus> statuses)
    {
       try
       {
-         getHAPartition().callMethodOnCluster(getServiceHAName(), "updateDRM", new Object[]{ statuses }, new Class[]{ Map.class }, true);
+         getHAPartition().callMethodOnCluster(getServiceHAName(), "clusterStatusComplete", new Object[]{ statuses }, new Class[]{ Map.class }, true);
       }
       catch (Exception e)
       {
@@ -731,7 +730,7 @@
          
       }
       
-      public void updateDRM(Map<ClusterNode, PeerMCMPDiscoveryStatus> statuses)
+      public void clusterStatusComplete(Map<ClusterNode, PeerMCMPDiscoveryStatus> statuses)
       {
          HAPartition partition = this.coord.getHAPartition();
          ClusterNode cn = partition.getClusterNode();
@@ -836,6 +835,19 @@
             return null;
          }
       }
+
+      public GroupRpcResponse sendRequests(List<MCMPRequest> requests)
+      {
+         if (this.coord.isMasterNode())      
+         {
+            this.coord.localHandler.sendRequests(requests);
+            return SUCCESS;
+         }
+         else
+         {         
+            return null;
+         }
+      }
       
       public ResetRequestGroupRpcResponse getResetRequests()
       {