From 237d1f6a98cc967c78140fd888608fad8482fef3 Mon Sep 17 00:00:00 2001 From: Phil Yang Date: Sat, 3 Dec 2016 12:50:53 +0800 Subject: [PATCH] HBASE-17246 TestSerialReplication#testRegionMerge fails in master branch --- .../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java index 2072d6d..4963355 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java @@ -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 }; } -- 2.5.4 (Apple Git-61)