From 33991305e9ad3b3a63284aeb5b69e983bd8b0b41 Mon Sep 17 00:00:00 2001
From: zjushch <zjushch@unknown>
Date: Tue, 30 Jul 2013 01:42:06 +0000
Subject: [PATCH] HBASE-8940
 TestRegionMergeTransactionOnCluster#testWholesomeMerge may fail due to race
 in opening region(addendum)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1508268 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hbase/master/handler/DispatchMergingRegionHandler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java
index 0a8c6f84cdc..d09ea64362a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java
@@ -66,7 +66,7 @@ public class DispatchMergingRegionHandler extends EventHandler {
     this.region_b = region_b;
     this.forcible = forcible;
     this.timeout = server.getConfiguration().getInt(
-        "hbase.master.regionmerge.timeout", 30 * 1000);
+        "hbase.master.regionmerge.timeout", 120 * 1000);
   }
 
   @Override