Author: jdcryans
Date: Tue May 3 17:45:58 2011
New Revision: 1099155
URL: http://svn.apache.org/viewvc?rev=1099155&view=rev
Log:
HBASE-3846 Set RIT timeout higher
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1099155&r1=1099154&r2=1099155&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue May 3 17:45:58 2011
@@ -279,6 +279,7 @@ Release 0.90.3 - Unreleased
TASKS
HBASE-3748 Add rolling of thrift/rest daemons to graceful_stop.sh script
+ HBASE-3846 Set RIT timeout higher
Release 0.90.2 - 20110408
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1099155&r1=1099154&r2=1099155&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Tue May 3 17:45:58 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", 30000));
+ conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 180000));
Threads.setDaemonThreadRunning(timeoutMonitor,
master.getServerName() + ".timeoutMonitor");
this.zkTable = new ZKTable(this.master.getZooKeeper());
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1099155&r1=1099154&r2=1099155&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Tue May 3 17:45:58 2011
@@ -2158,7 +2158,7 @@ public class HRegion implements HeapSize
// How often to send a progress report (default 1/2 master timeout)
int period = this.conf.getInt("hbase.hstore.report.period",
this.conf.getInt("hbase.master.assignment.timeoutmonitor.timeout",
- 30000) / 2);
+ 180000) / 2);
long lastReport = EnvironmentEdgeManager.currentTimeMillis();
while ((entry = reader.next()) != null) {
