Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3846 Set RIT timeout higher 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1099155 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2011-05-03 17:45:58 +00:00
parent 59392e209f
commit 94d77931b3
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -279,6 +279,7 @@ Release 0.90.3 - Unreleased
TASKS TASKS
HBASE-3748 Add rolling of thrift/rest daemons to graceful_stop.sh script HBASE-3748 Add rolling of thrift/rest daemons to graceful_stop.sh script
HBASE-3846 Set RIT timeout higher
Release 0.90.2 - 20110408 Release 0.90.2 - 20110408

2
src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
View File

@ -160,7 +160,7 @@ public class AssignmentManager extends ZooKeeperListener {
this.timeoutMonitor = new TimeoutMonitor( this.timeoutMonitor = new TimeoutMonitor(
conf.getInt("hbase.master.assignment.timeoutmonitor.period", 10000), conf.getInt("hbase.master.assignment.timeoutmonitor.period", 10000),
master, master,
conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 30000)); conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 180000));
Threads.setDaemonThreadRunning(timeoutMonitor, Threads.setDaemonThreadRunning(timeoutMonitor,
master.getServerName() + ".timeoutMonitor"); master.getServerName() + ".timeoutMonitor");
this.zkTable = new ZKTable(this.master.getZooKeeper()); this.zkTable = new ZKTable(this.master.getZooKeeper());

2
src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -2158,7 +2158,7 @@ public class HRegion implements HeapSize { // , Writable{
// How often to send a progress report (default 1/2 master timeout) // How often to send a progress report (default 1/2 master timeout)
int period = this.conf.getInt("hbase.hstore.report.period", int period = this.conf.getInt("hbase.hstore.report.period",
this.conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", this.conf.getInt("hbase.master.assignment.timeoutmonitor.timeout",
30000) / 2); 180000) / 2);
long lastReport = EnvironmentEdgeManager.currentTimeMillis(); long lastReport = EnvironmentEdgeManager.currentTimeMillis();
while ((entry = reader.next()) != null) { while ((entry = reader.next()) != null) {