svn commit: r1557891 - in /hama/trunk: CHANGES.txt graph/src/main/java/org/apache/hama/graph/GraphJob.java graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java

[edwardyoon]

Author: edwardyoon
Date: Tue Jan 14 00:24:51 2014
New Revision: 1557891

URL: http://svn.apache.org/r1557891
Log:
HAMA-843: Message communication overhead between master aggregation and vertex 
computation supersteps

Modified:
    hama/trunk/CHANGES.txt
    hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java
    hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java

Modified: hama/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1557891&r1=1557890&r2=1557891&view=diff
==============================================================================
--- hama/trunk/CHANGES.txt (original)
+++ hama/trunk/CHANGES.txt Tue Jan 14 00:24:51 2014
@@ -23,6 +23,7 @@ Release 0.7.0 (unreleased changes)
 
   IMPROVEMENTS
 
+   HAMA-843: Message communication overhead between master aggregation and 
vertex computation supersteps (edwardyoon)
    HAMA-838: Refactor aggregators (Anastasis Andronidis)
    HAMA-783: Improve the InMemory verticesInfo implementations (edwardyoon)
    HAMA-829: Improve code and fix Javadoc warnings in org.apache.hama.pipes 
(Martin Illecker)

Modified: hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java?rev=1557891&r1=1557890&r2=1557891&view=diff
==============================================================================
--- hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java 
(original)
+++ hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJob.java Tue Jan 
14 00:24:51 2014
@@ -31,6 +31,7 @@ import org.apache.hama.bsp.HashPartition
 import org.apache.hama.bsp.Partitioner;
 import org.apache.hama.bsp.PartitioningRunner.RecordConverter;
 import org.apache.hama.bsp.message.MessageManager;
+import org.apache.hama.bsp.message.queue.MessageQueue;
 import org.apache.hama.bsp.message.queue.MessageTransferQueue;
 import org.apache.hama.bsp.message.queue.SortedMessageTransferProtocol;
 
@@ -64,6 +65,7 @@ public class GraphJob extends BSPJob {
     this.setVertexValueClass(IntWritable.class);
     this.setEdgeValueClass(IntWritable.class);
     this.setPartitioner(HashPartitioner.class);
+    this.setMessageQueueBehaviour(MessageQueue.PERSISTENT_QUEUE);
   }
 
   /**

Modified: 
hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java?rev=1557891&r1=1557890&r2=1557891&view=diff
==============================================================================
--- hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java 
(original)
+++ hama/trunk/graph/src/main/java/org/apache/hama/graph/GraphJobRunner.java 
Tue Jan 14 00:24:51 2014
@@ -200,18 +200,10 @@ public final class GraphJobRunner<V exte
       }
     }
 
-    // in case we need to sync, we need to replay the messages that already
-    // are added to the queue. This prevents loosing messages when using
-    // aggregators.
     if (firstVertexMessage != null) {
       peer.send(peer.getPeerName(), firstVertexMessage);
     }
 
-    GraphJobMessage msg = null;
-    while ((msg = peer.getCurrentMessage()) != null) {
-      peer.send(peer.getPeerName(), msg);
-    }
-
     // now sync
     peer.sync();
     // now the map message must be read that might be send from the master