You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/09/20 06:37:58 UTC
[hbase] branch branch-2.1 updated: HBASE-22941 merge operation
returns parent regions in random order (#556)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c34507b HBASE-22941 merge operation returns parent regions in random order (#556)
c34507b is described below
commit c34507b36da315c3909f902a803c4c708edae1ee
Author: Istvan Toth <st...@users.noreply.github.com>
AuthorDate: Thu Aug 29 21:27:33 2019 +0200
HBASE-22941 merge operation returns parent regions in random order (#556)
* HBASE-22941 merge operation returns parent regions in random order
store and return the merge parent regions in ascending order
remove left over check for exactly two merged regions
add unit test
* use SortedMap type to emphasise that the Map is sorted.
* use regionCount consistently and checkstyle fixes
* Delete tests that expect multiregion merges to fail.
Signed-off-by: stack <st...@apache.org>
---
.../hbase/master/assignment/RegionStateStore.java | 6 +--
.../org/apache/hadoop/hbase/TestSplitMerge.java | 47 ++++++++++++++++++++++
.../hbase/client/TestAsyncRegionAdminApi2.java | 17 ++++----
3 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java
index fd48497..5757053 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java
@@ -19,9 +19,9 @@ package org.apache.hadoop.hbase.master.assignment;
import java.io.IOException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellBuilderFactory;
@@ -246,7 +246,7 @@ public class RegionStateStore {
throws IOException {
TableDescriptor htd = getTableDescriptor(child.getTable());
boolean globalScope = htd.hasGlobalReplicationScope();
- Map<RegionInfo, Long> parentSeqNums = new HashMap<>(parents.length);
+ SortedMap<RegionInfo, Long> parentSeqNums = new TreeMap<>();
for (RegionInfo ri: parents) {
parentSeqNums.put(ri, globalScope? getOpenSeqNumForParentRegion(ri): -1);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
index 641e52e..81008f5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
@@ -19,7 +19,9 @@ package org.apache.hadoop.hbase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
import org.apache.hadoop.hbase.client.AsyncConnection;
@@ -104,4 +106,49 @@ public class TestSplitMerge {
.getRegionLocation(Bytes.toBytes(1), true).get().getServerName());
}
}
+
+ @Test
+ public void testMergeRegionOrder() throws Exception {
+ int regionCount= 2;
+
+ TableName tableName = TableName.valueOf("MergeRegionOrder");
+ byte[] family = Bytes.toBytes("CF");
+ TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)
+ .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build();
+
+ byte[][] splitKeys = new byte[regionCount-1][];
+
+ for (int c = 0; c < regionCount-1; c++) {
+ splitKeys[c] = Bytes.toBytes(c+1 * 1000);
+ }
+
+ UTIL.getAdmin().createTable(td, splitKeys);
+ UTIL.waitTableAvailable(tableName);
+
+ List<RegionInfo> regions = UTIL.getAdmin().getRegions(tableName);
+
+ byte[][] regionNames = new byte[regionCount][];
+ for (int c = 0; c < regionCount; c++) {
+ regionNames[c] = regions.get(c).getRegionName();
+ }
+
+ UTIL.getAdmin().mergeRegionsAsync(regionNames, false).get(60, TimeUnit.SECONDS);
+
+ List<RegionInfo> mergedRegions =
+ MetaTableAccessor.getTableRegions(UTIL.getConnection(), tableName);
+
+ assertEquals(1, mergedRegions.size());
+
+ RegionInfo mergedRegion = mergedRegions.get(0);
+
+ List<RegionInfo> mergeParentRegions = MetaTableAccessor.getMergeRegions(UTIL.getConnection(),
+ mergedRegion.getRegionName());
+
+ assertEquals(mergeParentRegions.size(), regionCount);
+
+ for (int c = 0; c < regionCount - 1; c++) {
+ assertTrue(Bytes.compareTo(mergeParentRegions.get(c).getStartKey(),
+ mergeParentRegions.get(c + 1).getStartKey()) < 0);
+ }
+ }
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java
index 1642eec..15e3e0c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java
@@ -17,6 +17,14 @@
*/
package org.apache.hadoop.hbase.client;
+import static org.apache.hadoop.hbase.TableName.META_TABLE_NAME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
import org.apache.hadoop.hbase.AsyncMetaTableAccessor;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HConstants;
@@ -33,15 +41,6 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static org.apache.hadoop.hbase.TableName.META_TABLE_NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
/**
* Class to test asynchronous region admin operations.
* @see TestAsyncRegionAdminApi This test and it used to be joined it was taking longer than our