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
2013-07-30 01:42:06 +00:00 · 2013-07-30 01:42:06 +00:00 · 33991305e9
parent 45968ad1b9
commit 33991305e9
1 changed files with 1 additions and 1 deletions
--- 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