svn commit: r1384876 - in /giraph/trunk: CHANGELOG src/main/java/org/apache/giraph/graph/BspServiceMaster.java

[ereisman]

Author: ereisman
Date: Fri Sep 14 18:18:35 2012
New Revision: 1384876

URL: http://svn.apache.org/viewvc?rev=1384876&view=rev
Log:
GIRAPH-327: Timeout value in BspServiceMaster.barrierOnWorkerList (majakabiljo 
via ereisman)

Modified:
    giraph/trunk/CHANGELOG
    giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java

Modified: giraph/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1384876&r1=1384875&r2=1384876&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Fri Sep 14 18:18:35 2012
@@ -1,6 +1,9 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-327: Timesout values in BspServiceMaster.barrierOnWorkerList
+  (majakabiljo via ereisman)
+
   GIRAPH-323: Check if requests are done before calling wait (majakabiljo
   via ereisman)
 

Modified: 
giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java?rev=1384876&r1=1384875&r2=1384876&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java 
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java 
Fri Sep 14 18:18:35 2012
@@ -1326,6 +1326,9 @@ public class BspServiceMaster<I extends 
         getWorkerInfoHealthyPath(getApplicationAttempt(), getSuperstep());
     List<String> finishedHostnameIdList;
     long nextInfoMillis = System.currentTimeMillis();
+    final int defaultTaskTimeoutMsec = 10 * 60 * 1000;  // from TaskTracker
+    final int taskTimeoutMsec = getContext().getConfiguration().getInt(
+        "mapred.task.timeout", defaultTaskTimeoutMsec);
     while (true) {
       try {
         finishedHostnameIdList =
@@ -1376,9 +1379,8 @@ public class BspServiceMaster<I extends 
         break;
       }
 
-      // Wait for a signal or no more than 30 seconds to progress
-      // or else will continue.
-      event.waitMsecs(30 * 1000);
+      // Wait for a signal or timeout
+      event.waitMsecs(taskTimeoutMsec / 2);
       event.reset();
       getContext().progress();