hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1124181 - in /incubator/hama/trunk: CHANGES.txt src/java/org/apache/hama/zookeeper/QuorumPeer.java
Date Wed, 18 May 2011 10:45:48 GMT
Author: edwardyoon
Date: Wed May 18 10:45:48 2011
New Revision: 1124181

URL: http://svn.apache.org/viewvc?rev=1124181&view=rev
Log:
Make zk session-timeout configurable

Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/src/java/org/apache/hama/zookeeper/QuorumPeer.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1124181&r1=1124180&r2=1124181&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Wed May 18 10:45:48 2011
@@ -13,6 +13,7 @@ Release 0.3 - Unreleased
     
   IMPROVEMENTS
 
+    HAMA-392: Make zk session-timeout configurable (edwardyoon)
     HAMA-389: Make the thread pool size user configurable (Thomas Jungblut via edwardyoon)
     HAMA-386: Removing 'System.arraycopy(...)' call from ByteMessage (edwardyoon)
     HAMA-379: Setting default values to job.setNumBspTask() (Thomas Jungblut via edwardyoon)

Modified: incubator/hama/trunk/src/java/org/apache/hama/zookeeper/QuorumPeer.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/zookeeper/QuorumPeer.java?rev=1124181&r1=1124180&r2=1124181&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/zookeeper/QuorumPeer.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/zookeeper/QuorumPeer.java Wed May 18 10:45:48
2011
@@ -178,6 +178,10 @@ public class QuorumPeer implements Const
     // Otherwise, use the configuration options from Hama's XML files.
     Properties zkProperties = new Properties();
 
+    // Set the max session timeout from the provided client-side timeout
+    zkProperties.setProperty("maxSessionTimeout",
+        conf.get("hama.zookeeper.session.timeout", "1200000"));
+    
     // Directly map all of the hama.zookeeper.property.KEY properties.
     for (Entry<String, String> entry : conf) {
       String key = entry.getKey();



Mime
View raw message