You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2011/02/21 10:10:20 UTC

svn commit: r1072892 - in /incubator/hama/trunk/src: examples/org/apache/hama/examples/RandBench.java java/org/apache/hama/Constants.java java/org/apache/hama/bsp/BSPPeer.java

Author: edwardyoon
Date: Mon Feb 21 09:10:20 2011
New Revision: 1072892

URL: http://svn.apache.org/viewvc?rev=1072892&view=rev
Log:
remove ATLEAST_WAIT_TIME of sync() method.

Modified:
    incubator/hama/trunk/src/examples/org/apache/hama/examples/RandBench.java
    incubator/hama/trunk/src/java/org/apache/hama/Constants.java
    incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPPeer.java

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/RandBench.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/RandBench.java?rev=1072892&r1=1072891&r2=1072892&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/RandBench.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/RandBench.java Mon Feb 21 09:10:20 2011
@@ -30,7 +30,6 @@ import org.apache.hama.bsp.BSPJobClient;
 import org.apache.hama.bsp.BSPMessage;
 import org.apache.hama.bsp.BSPPeerProtocol;
 import org.apache.hama.bsp.ClusterStatus;
-import org.apache.hama.examples.PiEstimator.MyEstimator;
 import org.apache.hama.util.Bytes;
 import org.apache.zookeeper.KeeperException;
 
@@ -40,7 +39,7 @@ public class RandBench {
   private static final String N_SUPERSTEPS = "supersteps.num";
 
   public static class RandBSP extends BSP {
-    public static final Log LOG = LogFactory.getLog(MyEstimator.class);
+    public static final Log LOG = LogFactory.getLog(RandBSP.class);
     private Configuration conf;
     private Random r = new Random();
     private int sizeOfMsg;

Modified: incubator/hama/trunk/src/java/org/apache/hama/Constants.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/Constants.java?rev=1072892&r1=1072891&r2=1072892&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/Constants.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/Constants.java Mon Feb 21 09:10:20 2011
@@ -46,7 +46,6 @@ public interface Constants {
   /** Default port region server listens on. */
   public static final int DEFAULT_PEER_PORT = 61000;
 
-  public static final long ATLEAST_WAIT_TIME = 10;
   public static final String PEER_ID = "bsp.peer.id";
   
   /** Parameter name for what groom server implementation to use. */

Modified: incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPPeer.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPPeer.java?rev=1072892&r1=1072891&r2=1072892&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPPeer.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/bsp/BSPPeer.java Mon Feb 21 09:10:20 2011
@@ -182,14 +182,6 @@ public class BSPPeer implements Watcher,
     // Clear outgoing queues.
     clearOutgoingQueues();
 
-    // TODO - This is temporary work
-    // because
-    // it can be affected by network condition,
-    // the number of peers, and the load of zookeeper.
-    // It should fixed to some flawless way.
-    
-    Thread.sleep(Constants.ATLEAST_WAIT_TIME); 
-    
     currentTaskStatus.incrementSuperstepCount();
     leaveBarrier();
   }