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

HBASE-8287 TestRegionMergeTransactionOnCluster failed in trunk build #4010 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1465528 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
zjushch 2013-04-08 02:29:44 +00:00
parent e7801729fa
commit 85cb78d878
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java
View File

@ -121,10 +121,14 @@ public class DispatchMergingRegionHandler extends EventHandler {
while (!masterServices.isStopped()) {
try {
Thread.sleep(20);
// Make sure check RIT first, then get region location, otherwise
// we would make a wrong result if region is online between getting
// region location and checking RIT
boolean isRIT = regionStates.isRegionInTransition(region_b);
region_b_location = masterServices.getAssignmentManager()
.getRegionStates().getRegionServerOfRegion(region_b);
onSameRS = region_a_location.equals(region_b_location);
if (onSameRS || !regionStates.isRegionInTransition(region_b)) {
if (onSameRS || !isRIT) {
// Regions are on the same RS, or region_b is not in
// RegionInTransition any more
break;