From 27f9a5cd7bddf43df6ac365507fa96db63d2243e Mon Sep 17 00:00:00 2001 From: jxiang Date: Mon, 29 Oct 2012 20:52:45 +0000 Subject: [PATCH] HBASE-5119 Set the TimeoutMonitor's timeout back down git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1403500 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/master/AssignmentManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 38dec34b7c1..73683097e03 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -186,9 +186,9 @@ public class AssignmentManager extends ZooKeeperListener { (new HashMap ()); Configuration conf = server.getConfiguration(); this.timeoutMonitor = new TimeoutMonitor( - conf.getInt("hbase.master.assignment.timeoutmonitor.period", 60000), + conf.getInt("hbase.master.assignment.timeoutmonitor.period", 30000), server, serverManager, - conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 1200000)); + conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 600000)); this.timerUpdater = new TimerUpdater(conf.getInt( "hbase.master.assignment.timerupdater.period", 10000), server); Threads.setDaemonThreadRunning(timerUpdater.getThread(),