From 25c43285bd842d63a8b50df3d41818103bdf8c82 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 22 Jul 2011 20:18:32 +0000 Subject: [PATCH] HBASE-4126 Make timeoutmonitor timeout after 30 minutes instead of 3 git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1149720 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + .../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2d9d49855ff..52460aa104c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -423,6 +423,7 @@ Release 0.90.4 - Unreleased HBASE-4101 Regionserver Deadlock (ramkrishna.s.vasudevan) HBASE-4115 HBase shell assign and unassign unusable if region name includes binary-encoded data (Ryan Brush) + 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 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 63f6322fcae..07b1628ff05 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -163,7 +163,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", 180000)); + conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 1800000)); Threads.setDaemonThreadRunning(timeoutMonitor, master.getServerName() + ".timeoutMonitor"); this.zkTable = new ZKTable(this.master.getZooKeeper());