From 94d77931b38a2eb62a75f8ea04141e08a19c80c9 Mon Sep 17 00:00:00 2001
From: Jean-Daniel Cryans <jdcryans@apache.org>
Date: Tue, 3 May 2011 17:45:58 +0000
Subject: [PATCH] HBASE-3846  Set RIT timeout higher

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1099155 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                     | 1 +
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java  | 2 +-
 src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 159ce772a1c..8e21b146e73 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
   
diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index a34b7e5f4be..57af9f4356a 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -160,7 +160,7 @@ public class AssignmentManager extends ZooKeeperListener {
     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());
diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 80def6958d2..11fd50e7745 100644
--- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -2158,7 +2158,7 @@ public class HRegion implements HeapSize { // , Writable{
       // 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) {