You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zj...@apache.org on 2013/07/30 03:42:07 UTC
svn commit: r1508268 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java
Author: zjushch
Date: Tue Jul 30 01:42:06 2013
New Revision: 1508268
URL: http://svn.apache.org/r1508268
Log:
HBASE-8940 TestRegionMergeTransactionOnCluster#testWholesomeMerge may fail due to race in opening region(addendum)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java?rev=1508268&r1=1508267&r2=1508268&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java Tue Jul 30 01:42:06 2013
@@ -66,7 +66,7 @@ public class DispatchMergingRegionHandle
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