svn commit: r1149719 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[stack]

Author: stack
Date: Fri Jul 22 20:17:23 2011
New Revision: 1149719

URL: http://svn.apache.org/viewvc?rev=1149719&view=rev
Log:
HBASE-4126 Make timeoutmonitor timeout after 30 minutes instead of 3

Modified:
    hbase/branches/0.90/CHANGES.txt
    
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1149719&r1=1149718&r2=1149719&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Jul 22 20:17:23 2011
@@ -82,6 +82,7 @@ Release 0.90.4 - Unreleased
                qualifier and family is missing (N Keywal via Ted Yu)
    HBASE-4109  Hostname returned via reverse dns lookup contains trailing 
period if
                configured interface is not "default" (Shrijeet Paliwal)
+   HBASE-4126  Make timeoutmonitor timeout after 30 minutes instead of 3
 
   IMPROVEMENT
    HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1149719&r1=1149718&r2=1149719&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
 Fri Jul 22 20:17:23 2011
@@ -160,7 +160,7 @@ public class AssignmentManager extends Z
     this.timeoutMonitor = new TimeoutMonitor(
       conf.getInt("hbase.master.assignment.timeoutmonitor.period", 10000),
       master,
-      conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 180000));
+      conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 1800000));
     Threads.setDaemonThreadRunning(timeoutMonitor,
       master.getServerName() + ".timeoutMonitor");
     this.zkTable = new ZKTable(this.master.getZooKeeper());