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

HBASE-17246 TestSerialReplication#testRegionMerge fails in master branch

This commit is contained in:
Phil Yang 2016-12-04 20:58:14 +08:00
parent 42ff4a7164
commit c73180d456
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
View File

@ -1686,7 +1686,10 @@ public class MetaTableAccessor {
mergedRegion.getEncodedNameAsBytes());
Put putBarrierB = makeDaughterPut(regionB.getEncodedNameAsBytes(),
mergedRegion.getEncodedNameAsBytes());
mutations = new Mutation[] { putOfMerged, deleteA, deleteB, putBarrierA, putBarrierB };
Put putDaughter = makeParentPut(mergedRegion.getEncodedNameAsBytes(), Bytes.toBytes(
regionA.getEncodedName() + "," + regionB.getEncodedName()));
mutations = new Mutation[] { putOfMerged, deleteA, deleteB,
putBarrierA, putBarrierB, putDaughter};
} else {
mutations = new Mutation[] { putOfMerged, deleteA, deleteB };
}