svn commit: r1384115 - in /giraph/trunk: CHANGELOG src/main/java/org/apache/giraph/graph/GiraphJob.java src/main/java/org/apache/giraph/zk/ZooKeeperManager.java src/test/java/org/apache/giraph/TestAutoCheckpoint.java

[aching]

Author: aching
Date: Wed Sep 12 20:40:23 2012
New Revision: 1384115

URL: http://svn.apache.org/viewvc?rev=1384115&view=rev
Log:
GIRAPH-298: Reduce timeout for TestAutoCheckpoint. (majakabiljo via
aching)

Modified:
    giraph/trunk/CHANGELOG
    giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java
    giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
    giraph/trunk/src/test/java/org/apache/giraph/TestAutoCheckpoint.java

Modified: giraph/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1384115&r1=1384114&r2=1384115&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Wed Sep 12 20:40:23 2012
@@ -1,6 +1,9 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+
+  GIRAPH-298: Reduce timeout for TestAutoCheckpoint. (majakabiljo via
+  aching)
        
   GIRAPH-324: Add option to use combiner in benchmarks. (apresta via
   aching)

Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java?rev=1384115&r1=1384114&r2=1384115&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/GiraphJob.java Wed Sep 
12 20:40:23 2012
@@ -475,6 +475,9 @@ public class GiraphJob {
   public static final int DEFAULT_ZOOKEEPER_SNAP_COUNT = 50000;
   /** Default ZooKeeper maximum client connections. */
   public static final int DEFAULT_ZOOKEEPER_MAX_CLIENT_CNXNS = 10000;
+  /** ZooKeeper minimum session timeout */
+  public static final String ZOOKEEPER_MIN_SESSION_TIMEOUT =
+      "giraph.zookeeperMinSessionTimeout";
   /** Default ZooKeeper minimum session timeout of 5 minutes (in msecs). */
   public static final int DEFAULT_ZOOKEEPER_MIN_SESSION_TIMEOUT = 300 * 1000;
   /** Default ZooKeeper maximum session timeout of 10 minutes (in msecs). */

Modified: giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java?rev=1384115&r1=1384114&r2=1384115&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java 
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java Wed 
Sep 12 20:40:23 2012
@@ -527,9 +527,10 @@ public class ZooKeeperManager {
         writer.write("maxClientCnxns=" +
             GiraphJob.DEFAULT_ZOOKEEPER_MAX_CLIENT_CNXNS +
             "\n");
-        writer.write("minSessionTimeout=" +
-            GiraphJob.DEFAULT_ZOOKEEPER_MIN_SESSION_TIMEOUT +
-            "\n");
+        int minSessionTimeout = conf.getInt(
+            GiraphJob.ZOOKEEPER_MIN_SESSION_TIMEOUT,
+            GiraphJob.DEFAULT_ZOOKEEPER_MIN_SESSION_TIMEOUT);
+        writer.write("minSessionTimeout=" + minSessionTimeout + "\n");
         writer.write("maxSessionTimeout=" +
             GiraphJob.DEFAULT_ZOOKEEPER_MAX_SESSION_TIMEOUT +
             "\n");

Modified: giraph/trunk/src/test/java/org/apache/giraph/TestAutoCheckpoint.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/TestAutoCheckpoint.java?rev=1384115&r1=1384114&r2=1384115&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/TestAutoCheckpoint.java 
(original)
+++ giraph/trunk/src/test/java/org/apache/giraph/TestAutoCheckpoint.java Wed 
Sep 12 20:40:23 2012
@@ -74,6 +74,8 @@ public class TestAutoCheckpoint extends 
     conf.set(GiraphJob.CHECKPOINT_DIRECTORY,
         getTempPath("_singleFaultCheckpoints").toString());
     conf.setBoolean(GiraphJob.CLEANUP_CHECKPOINTS_AFTER_SUCCESS, false);
+    conf.setInt(GiraphJob.ZOOKEEPER_SESSION_TIMEOUT, 10000);
+    conf.setInt(GiraphJob.ZOOKEEPER_MIN_SESSION_TIMEOUT, 10000);
 
     assertTrue(job.run(true));
   }