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