Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13383 TestRegionServerObserver.testCoprocessorHooksInRegionsMerge zombie after HBASE-12975

This commit is contained in:
Andrew Purtell 2015-04-01 21:46:08 -07:00
parent a609e5e107
commit 2688e831e5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
View File

@ -121,14 +121,14 @@ public class RegionMergeTransactionImpl implements RegionMergeTransaction {
* @param b region b to merge * @param b region b to merge
* @param forcible if false, we will only merge adjacent regions * @param forcible if false, we will only merge adjacent regions
*/ */
public RegionMergeTransactionImpl(final HRegion a, final HRegion b, public RegionMergeTransactionImpl(final Region a, final Region b,
final boolean forcible) { final boolean forcible) {
if (a.getRegionInfo().compareTo(b.getRegionInfo()) <= 0) { if (a.getRegionInfo().compareTo(b.getRegionInfo()) <= 0) {
this.region_a = a; this.region_a = (HRegion)a;
this.region_b = b; this.region_b = (HRegion)b;
} else { } else {
this.region_a = b; this.region_a = (HRegion)b;
this.region_b = a; this.region_b = (HRegion)a;
} }
this.forcible = forcible; this.forcible = forcible;
this.mergesdir = region_a.getRegionFileSystem().getMergesDir(); this.mergesdir = region_a.getRegionFileSystem().getMergesDir();