You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/09/26 21:20:19 UTC

svn commit: r1176006 - in /incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl: ConsumerHandler.java FixedParallelSender.java ParallelSender.java

Author: patanachai
Date: Mon Sep 26 19:20:19 2011
New Revision: 1176006

URL: http://svn.apache.org/viewvc?rev=1176006&view=rev
Log:
AIRAVATA-101 Correct synchronization problem

Modified:
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java?rev=1176006&r1=1176005&r2=1176006&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ConsumerHandler.java Mon Sep 26 19:20:19 2011
@@ -38,35 +38,18 @@ public abstract class ConsumerHandler im
     
     protected LinkedBlockingQueue<LightweightMsg> queue = new LinkedBlockingQueue<LightweightMsg>();
 
-    private final String id;
-
     private String consumerUrl;
 
     private Deliverable deliverable;
 
     public ConsumerHandler(String url, Deliverable deliverable) {
-        this.id = UUID.randomUUID().toString();
         this.consumerUrl = url;
         this.deliverable = deliverable;
     }
     
     public String getConsumerUrl() {
         return consumerUrl;
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (o instanceof ConsumerHandler) {
-            ConsumerHandler h = (ConsumerHandler) o;
-            return this.id.equals(h.id);            
-        }
-        return false;
-    }     
-
-    @Override
-    public int hashCode() {
-        return this.id.hashCode();        
-    }
+    }   
 
     public void submitMessage(LightweightMsg msg) {
         try {

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java?rev=1176006&r1=1176005&r2=1176006&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/FixedParallelSender.java Mon Sep 26 19:20:19 2011
@@ -54,21 +54,16 @@ public class FixedParallelSender impleme
     }
 
     public void addMessageToSend(OutGoingMessage outMessage, Deliverable deliverable) {
-        distributeOverConsumerQueues(outMessage, deliverable);
+        List<ConsumerInfo> consumerInfoList = outMessage.getConsumerInfoList();
+        for (ConsumerInfo consumer : consumerInfoList) {
+            sendToConsumerHandler(consumer, outMessage, deliverable);
+        }
     }
 
     public void shutdown() {
         threadPool.shutdown();
     }
 
-    public void distributeOverConsumerQueues(OutGoingMessage message, Deliverable deliverable) {
-        List<ConsumerInfo> consumerInfoList = message.getConsumerInfoList();
-
-        for (ConsumerInfo consumer : consumerInfoList) {
-            sendToConsumerHandler(consumer, message, deliverable);
-        }
-    }
-
     private void sendToConsumerHandler(ConsumerInfo consumer, OutGoingMessage message, Deliverable deliverable) {
 
         String consumerUrl = consumer.getConsumerEprStr();
@@ -89,14 +84,6 @@ public class FixedParallelSender impleme
         }
     }
 
-    public void removeFromList(ConsumerHandler h) {
-        synchronized (activeConsumerHanders) {
-            if (activeConsumerHanders.remove(h.getConsumerUrl()) != null) {
-                log.debug(String.format("inactive consumer handler is already removed: url : %s", h.getConsumerUrl()));
-            }
-        }
-    }
-
     class FixedParallelConsumerHandler extends ConsumerHandler {
 
         public FixedParallelConsumerHandler(String url, Deliverable deliverable) {
@@ -112,16 +99,20 @@ public class FixedParallelSender impleme
             queue.drainTo(localList, batchSize);
 
             send(localList);
-            localList.clear();
-
-            log.debug(String.format("FixedParallelConsumerHandler done: %s,", getConsumerUrl()));
+            localList.clear();            
 
             /*
-             * Remove handler if there is no message
+             * Remove handler if and only if there is no message
              */
-            if (queue.size() == 0) {
-                removeFromList(this);
+            synchronized (activeConsumerHanders) {
+                if (queue.size() == 0) {
+                    if (activeConsumerHanders.remove(getConsumerUrl()) != null) {
+                        log.debug(String.format("Consumer handler is already removed: %s", getConsumerUrl()));
+                    }                    
+                }
             }
+            
+            log.debug(String.format("FixedParallelConsumerHandler done: %s,", getConsumerUrl()));
         }
     }
 }

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java?rev=1176006&r1=1176005&r2=1176006&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/strategy/impl/ParallelSender.java Mon Sep 26 19:20:19 2011
@@ -52,20 +52,16 @@ public class ParallelSender implements S
     }
 
     public void addMessageToSend(OutGoingMessage outMessage, Deliverable deliverable) {
-        distributeOverConsumerQueues(outMessage, deliverable);
+        List<ConsumerInfo> consumerInfoList = outMessage.getConsumerInfoList();
+        for (ConsumerInfo consumer : consumerInfoList) {
+            sendToConsumerHandler(consumer, outMessage, deliverable);
+        }
     }
 
     public void shutdown() {
         threadPool.shutdown();
     }
-
-    public void distributeOverConsumerQueues(OutGoingMessage message, Deliverable deliverable) {
-        List<ConsumerInfo> consumerInfoList = message.getConsumerInfoList();
-        for (ConsumerInfo consumer : consumerInfoList) {
-            sendToConsumerHandler(consumer, message, deliverable);
-        }
-    }
-
+    
     private void sendToConsumerHandler(ConsumerInfo consumer, OutGoingMessage message, Deliverable deliverable) {
         String consumerUrl = consumer.getConsumerEprStr();
 
@@ -85,19 +81,11 @@ public class ParallelSender implements S
         }
     }
 
-    public void removeFromList(ConsumerHandler h) {
-        synchronized (activeConsumerHanders) {
-            if (activeConsumerHanders.remove(h.getConsumerUrl()) != null) {
-                log.debug(String.format("inactive consumer handler is already removed: url : %s", h.getConsumerUrl()));
-            }
-        }
-    }
-
     class ParallelConsumerHandler extends ConsumerHandler {
 
-        private static final int MAX_UNSUCCESSFULL_DRAINS = 3;
+        private static final int MAX_UNSUCCESSFUL_DRAINS = 3;
         private static final int SLEEP_TIME_SECONDS = 1;
-        private int numberOfUnsuccessfullDrainAttempts = 0;
+        private int numberOfUnsuccessfulDrain = 0;
 
         public ParallelConsumerHandler(String url, Deliverable deliverable) {
             super(url, deliverable);
@@ -113,28 +101,33 @@ public class ParallelSender implements S
                  * Try to find more message to send out
                  */
                 if (queue.drainTo(localList) <= 0) {
-                    numberOfUnsuccessfullDrainAttempts++;
+                    numberOfUnsuccessfulDrain++;
                 } else {
-                    numberOfUnsuccessfullDrainAttempts = 0;
+                    numberOfUnsuccessfulDrain = 0;
                 }
 
                 /*
                  * No new message for sometimes
                  */
-                if (numberOfUnsuccessfullDrainAttempts >= MAX_UNSUCCESSFULL_DRAINS) {
-                    log.debug(String.format("ParallelConsumerHandler inactivating, %s", getConsumerUrl()));
-                    numberOfUnsuccessfullDrainAttempts = 0;
-
-                    log.debug(String.format("ParallelConsumerHandler done: %s,",
-                            getConsumerUrl()));
-                    removeFromList(this);
-                    break;
+                if (numberOfUnsuccessfulDrain >= MAX_UNSUCCESSFUL_DRAINS) {
+                    /*
+                     * Stop this thread if and only if there is no message
+                     */
+                    synchronized (activeConsumerHanders) {
+                        if (queue.size() == 0) {                             
+                            if (activeConsumerHanders.remove(getConsumerUrl()) != null) {
+                                log.debug(String.format("Consumer handler is already removed: %s", getConsumerUrl()));
+                            }
+                            log.debug(String.format("ParallelConsumerHandler done: %s,", getConsumerUrl()));
+                            break;
+                        }
+                    }                    
                 }
 
                 send(localList);
                 localList.clear();
 
-                if (numberOfUnsuccessfullDrainAttempts > 0) {
+                if (numberOfUnsuccessfulDrain > 0) {
                     waitForMessages();
                 }
             }