Repository: hbase Updated Branches: refs/heads/master 42ff4a716 -> c73180d45
HBASE-17246 TestSerialReplication#testRegionMerge fails in master branch Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c73180d4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c73180d4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c73180d4 Branch: refs/heads/master Commit: c73180d45620287ffcdeeaca57484465d5a3b30b Parents: 42ff4a7 Author: Phil Yang <[email protected]> Authored: Sun Dec 4 20:58:14 2016 +0800 Committer: Phil Yang <[email protected]> Committed: Sun Dec 4 20:58:14 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c73180d4/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java ---------------------------------------------------------------------- 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 }; }
