### Eclipse Workspace Patch 1.0 #P hbase Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1330191) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -514,6 +514,7 @@ } } + this.assignmentManager.startTimeOutMonitor(); Set onlineServers = new HashSet(serverManager .getOnlineServers().keySet()); // TODO: Should do this in background rather than block master startup Index: src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (revision 1330191) +++ src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (working copy) @@ -207,14 +207,17 @@ conf.getInt("hbase.master.assignment.timeoutmonitor.period", 10000), master, serverManager, conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 1800000)); - Threads.setDaemonThreadRunning(timeoutMonitor.getThread(), - master.getServerName() + ".timeoutMonitor"); this.zkTable = new ZKTable(this.master.getZooKeeper()); this.maximumAssignmentAttempts = this.master.getConfiguration().getInt("hbase.assignment.maximum.attempts", 10); this.balancer = balancer; this.threadPoolExecutorService = Executors.newCachedThreadPool(); } + + void startTimeOutMonitor() { + Threads.setDaemonThreadRunning(timeoutMonitor.getThread(), master.getServerName() + + ".timeoutMonitor"); + } /** * Compute the average load across all region servers.