Skip to content

HBASE-30145 Upgrade hbase-server to use junit5 Part17 #8263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liuxiaocs7 wants to merge 1 commit into
base: branch-2.5
Choose a base branch
from
Open

HBASE-30145 Upgrade hbase-server to use junit5 Part17 #8263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 59 additions & 68 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,17 @@
*/
package org.apache.hadoop.hbase.regionserver;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
Expand All @@ -44,50 +43,49 @@
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.FSTableDescriptors;
import org.apache.hadoop.hbase.util.MD5Hash;
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;

import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations;

import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;

@Category({ RegionServerTests.class, SmallTests.class })
@Tag(RegionServerTests.TAG)
@Tag(SmallTests.TAG)
public class TestHRegionInfo {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestHRegionInfo.class);
private String methodName;

@Rule
public TestName name = new TestName();
@BeforeEach
public void setUp(TestInfo testInfo) {
methodName = testInfo.getTestMethod().get().getName();
}

@Test
public void testIsStart() {
assertTrue(RegionInfoBuilder.FIRST_META_REGIONINFO.isFirst());
org.apache.hadoop.hbase.client.RegionInfo ri = org.apache.hadoop.hbase.client.RegionInfoBuilder
.newBuilder(TableName.META_TABLE_NAME).setStartKey(Bytes.toBytes("not_start")).build();
RegionInfo ri = RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME)
.setStartKey(Bytes.toBytes("not_start")).build();
assertFalse(ri.isFirst());
}

@Test
public void testIsEnd() {
assertTrue(RegionInfoBuilder.FIRST_META_REGIONINFO.isFirst());
org.apache.hadoop.hbase.client.RegionInfo ri = org.apache.hadoop.hbase.client.RegionInfoBuilder
.newBuilder(TableName.META_TABLE_NAME).setEndKey(Bytes.toBytes("not_end")).build();
RegionInfo ri = RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME)
.setEndKey(Bytes.toBytes("not_end")).build();
assertFalse(ri.isLast());
}

@Test
public void testIsNext() {
byte[] bytes = Bytes.toBytes("row");
org.apache.hadoop.hbase.client.RegionInfo ri = org.apache.hadoop.hbase.client.RegionInfoBuilder
.newBuilder(TableName.META_TABLE_NAME).setEndKey(bytes).build();
org.apache.hadoop.hbase.client.RegionInfo ri2 = org.apache.hadoop.hbase.client.RegionInfoBuilder
.newBuilder(TableName.META_TABLE_NAME).setStartKey(bytes).build();
RegionInfo ri =
RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME).setEndKey(bytes).build();
RegionInfo ri2 =
RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME).setStartKey(bytes).build();
assertFalse(ri.isNext(RegionInfoBuilder.FIRST_META_REGIONINFO));
assertTrue(ri.isNext(ri2));
}
Expand All @@ -98,20 +96,15 @@ public void testIsOverlap() {
byte[] b = Bytes.toBytes("b");
byte[] c = Bytes.toBytes("c");
byte[] d = Bytes.toBytes("d");
org.apache.hadoop.hbase.client.RegionInfo all = RegionInfoBuilder.FIRST_META_REGIONINFO;
org.apache.hadoop.hbase.client.RegionInfo ari = org.apache.hadoop.hbase.client.RegionInfoBuilder
.newBuilder(TableName.META_TABLE_NAME).setEndKey(a).build();
org.apache.hadoop.hbase.client.RegionInfo abri =
org.apache.hadoop.hbase.client.RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME)
.setStartKey(a).setEndKey(b).build();
org.apache.hadoop.hbase.client.RegionInfo adri =
org.apache.hadoop.hbase.client.RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME)
.setStartKey(a).setEndKey(d).build();
org.apache.hadoop.hbase.client.RegionInfo cdri =
org.apache.hadoop.hbase.client.RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME)
.setStartKey(c).setEndKey(d).build();
org.apache.hadoop.hbase.client.RegionInfo dri = org.apache.hadoop.hbase.client.RegionInfoBuilder
.newBuilder(TableName.META_TABLE_NAME).setStartKey(d).build();
RegionInfo all = RegionInfoBuilder.FIRST_META_REGIONINFO;
RegionInfo ari = RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME).setEndKey(a).build();
RegionInfo abri =
RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME).setStartKey(a).setEndKey(b).build();
RegionInfo adri =
RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME).setStartKey(a).setEndKey(d).build();
RegionInfo cdri =
RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME).setStartKey(c).setEndKey(d).build();
RegionInfo dri = RegionInfoBuilder.newBuilder(TableName.META_TABLE_NAME).setStartKey(d).build();
assertTrue(all.isOverlap(all));
assertTrue(all.isOverlap(abri));
assertFalse(abri.isOverlap(cdri));
Expand All @@ -127,7 +120,7 @@ public void testIsOverlap() {
}

/**
* Tests {@link RegionInfo#isOverlap(RegionInfo[])}
* Tests {@link RegionInfo#isOverlap(RegionInfo)}
*/
@Test
public void testIsOverlaps() {
Comment thread
liuxiaocs7 marked this conversation as resolved.
Expand Down Expand Up @@ -197,7 +190,7 @@ long getModTime(final HRegion r) throws IOException {

@Test
public void testCreateHRegionInfoName() throws Exception {
final String tableName = name.getMethodName();
final String tableName = methodName;
final TableName tn = TableName.valueOf(tableName);
String startKey = "startkey";
final byte[] sk = Bytes.toBytes(startKey);
Expand All @@ -218,7 +211,7 @@ public void testCreateHRegionInfoName() throws Exception {

@Test
public void testContainsRange() {
HTableDescriptor tableDesc = new HTableDescriptor(TableName.valueOf(name.getMethodName()));
HTableDescriptor tableDesc = new HTableDescriptor(TableName.valueOf(methodName));
HRegionInfo hri =
new HRegionInfo(tableDesc.getTableName(), Bytes.toBytes("a"), Bytes.toBytes("g"));
// Single row range at start of region
Expand Down Expand Up @@ -278,7 +271,7 @@ public void testContainsRangeForMetaTable() {

@Test
public void testLastRegionCompare() {
HTableDescriptor tableDesc = new HTableDescriptor(TableName.valueOf(name.getMethodName()));
HTableDescriptor tableDesc = new HTableDescriptor(TableName.valueOf(methodName));
HRegionInfo hrip = new HRegionInfo(tableDesc.getTableName(), Bytes.toBytes("a"), new byte[0]);
HRegionInfo hric =
new HRegionInfo(tableDesc.getTableName(), Bytes.toBytes("a"), Bytes.toBytes("b"));
Expand All @@ -293,7 +286,7 @@ public void testMetaTables() {
@SuppressWarnings("SelfComparison")
@Test
public void testComparator() {
final TableName tableName = TableName.valueOf(name.getMethodName());
final TableName tableName = TableName.valueOf(methodName);
byte[] empty = new byte[0];
HRegionInfo older = new HRegionInfo(tableName, empty, empty, false, 0L);
HRegionInfo newer = new HRegionInfo(tableName, empty, empty, false, 1L);
Expand Down Expand Up @@ -327,7 +320,7 @@ public void testComparator() {

@Test
public void testRegionNameForRegionReplicas() throws Exception {
String tableName = name.getMethodName();
String tableName = methodName;
final TableName tn = TableName.valueOf(tableName);
String startKey = "startkey";
final byte[] sk = Bytes.toBytes(startKey);
Expand Down Expand Up @@ -356,7 +349,7 @@ public void testRegionNameForRegionReplicas() throws Exception {

@Test
public void testParseName() throws IOException {
final TableName tableName = TableName.valueOf(name.getMethodName());
final TableName tableName = TableName.valueOf(methodName);
byte[] startKey = Bytes.toBytes("startKey");
long regionId = EnvironmentEdgeManager.currentTime();
int replicaId = 42;
Expand All @@ -365,25 +358,25 @@ public void testParseName() throws IOException {
byte[] regionName = HRegionInfo.createRegionName(tableName, startKey, regionId, false);

byte[][] fields = HRegionInfo.parseRegionName(regionName);
assertArrayEquals(Bytes.toString(fields[0]), tableName.getName(), fields[0]);
assertArrayEquals(Bytes.toString(fields[1]), startKey, fields[1]);
assertArrayEquals(Bytes.toString(fields[2]), Bytes.toBytes(Long.toString(regionId)), fields[2]);
assertArrayEquals(tableName.getName(), fields[0], Bytes.toString(fields[0]));
assertArrayEquals(startKey, fields[1], Bytes.toString(fields[1]));
assertArrayEquals(Bytes.toBytes(Long.toString(regionId)), fields[2], Bytes.toString(fields[2]));
assertEquals(3, fields.length);

// test with replicaId
regionName = HRegionInfo.createRegionName(tableName, startKey, regionId, replicaId, false);

fields = HRegionInfo.parseRegionName(regionName);
assertArrayEquals(Bytes.toString(fields[0]), tableName.getName(), fields[0]);
assertArrayEquals(Bytes.toString(fields[1]), startKey, fields[1]);
assertArrayEquals(Bytes.toString(fields[2]), Bytes.toBytes(Long.toString(regionId)), fields[2]);
assertArrayEquals(Bytes.toString(fields[3]),
Bytes.toBytes(String.format(HRegionInfo.REPLICA_ID_FORMAT, replicaId)), fields[3]);
assertArrayEquals(tableName.getName(), fields[0], Bytes.toString(fields[0]));
assertArrayEquals(startKey, fields[1], Bytes.toString(fields[1]));
assertArrayEquals(Bytes.toBytes(Long.toString(regionId)), fields[2], Bytes.toString(fields[2]));
assertArrayEquals(Bytes.toBytes(String.format(HRegionInfo.REPLICA_ID_FORMAT, replicaId)),
fields[3], Bytes.toString(fields[3]));
}

@Test
public void testConvert() {
final TableName tableName = TableName.valueOf("ns1:" + name.getMethodName());
final TableName tableName = TableName.valueOf("ns1:" + methodName);
byte[] startKey = Bytes.toBytes("startKey");
byte[] endKey = Bytes.toBytes("endKey");
boolean split = false;
Expand Down Expand Up @@ -420,25 +413,24 @@ public void testRegionDetailsForDisplay() throws IOException {
byte[] endKey = new byte[] { 0x01, 0x01, 0x02, 0x04 };
Configuration conf = new Configuration();
conf.setBoolean("hbase.display.keys", false);
HRegionInfo h = new HRegionInfo(TableName.valueOf(name.getMethodName()), startKey, endKey);
HRegionInfo h = new HRegionInfo(TableName.valueOf(methodName), startKey, endKey);
checkEquality(h, conf);
// check HRIs with non-default replicaId
h = new HRegionInfo(TableName.valueOf(name.getMethodName()), startKey, endKey, false,
h = new HRegionInfo(TableName.valueOf(methodName), startKey, endKey, false,
EnvironmentEdgeManager.currentTime(), 1);
checkEquality(h, conf);
Assert.assertArrayEquals(HRegionInfo.HIDDEN_END_KEY, HRegionInfo.getEndKeyForDisplay(h, conf));
Assert.assertArrayEquals(HRegionInfo.HIDDEN_START_KEY,
HRegionInfo.getStartKeyForDisplay(h, conf));
assertArrayEquals(HRegionInfo.HIDDEN_END_KEY, HRegionInfo.getEndKeyForDisplay(h, conf));
assertArrayEquals(HRegionInfo.HIDDEN_START_KEY, HRegionInfo.getStartKeyForDisplay(h, conf));

RegionState state = RegionState.createForTesting(h, RegionState.State.OPEN);
String descriptiveNameForDisplay =
HRegionInfo.getDescriptiveNameFromRegionStateForDisplay(state, conf);
checkDescriptiveNameEquality(descriptiveNameForDisplay, state.toDescriptiveString(), startKey);

conf.setBoolean("hbase.display.keys", true);
Assert.assertArrayEquals(endKey, HRegionInfo.getEndKeyForDisplay(h, conf));
Assert.assertArrayEquals(startKey, HRegionInfo.getStartKeyForDisplay(h, conf));
Assert.assertEquals(state.toDescriptiveString(),
assertArrayEquals(endKey, HRegionInfo.getEndKeyForDisplay(h, conf));
assertArrayEquals(startKey, HRegionInfo.getStartKeyForDisplay(h, conf));
assertEquals(state.toDescriptiveString(),
HRegionInfo.getDescriptiveNameFromRegionStateForDisplay(state, conf));
}

Expand Down Expand Up @@ -469,11 +461,10 @@ private void checkEquality(HRegionInfo h, Configuration conf) throws IOException
// all parts should match except for [1] where in the modified one,
// we should have "hidden_start_key"
if (i != 1) {
Assert.assertArrayEquals(regionNameParts[i], modifiedRegionNameParts[i]);
assertArrayEquals(regionNameParts[i], modifiedRegionNameParts[i]);
} else {
assertNotEquals(regionNameParts[i][0], modifiedRegionNameParts[i][0]);
Assert.assertArrayEquals(modifiedRegionNameParts[1],
HRegionInfo.getStartKeyForDisplay(h, conf));
assertArrayEquals(modifiedRegionNameParts[1], HRegionInfo.getStartKeyForDisplay(h, conf));
}
}
}
Expand Down
20 changes: 7 additions & 13 deletions ...ver/src/test/java/org/apache/hadoop/hbase/regionserver/TestObservedExceptionsInBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,24 @@
*/
package org.apache.hadoop.hbase.regionserver;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.regionserver.HRegion.ObservedExceptionsInBatch;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

/**
* Test class for {@link ObservedExceptionsInBatch}.
*/
@Category(SmallTests.class)
@Tag(SmallTests.TAG)
public class TestObservedExceptionsInBatch {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestObservedExceptionsInBatch.class);

private ObservedExceptionsInBatch observedExceptions;

@Before
@BeforeEach
public void setup() {
observedExceptions = new ObservedExceptionsInBatch();
}
Expand Down
32 changes: 14 additions & 18 deletions ...er/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenRegionFailedMemoryLeak.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
package org.apache.hadoop.hbase.regionserver;

import static org.apache.hadoop.hbase.HBaseTestingUtility.fam1;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.spy;

import java.io.IOException;
Expand All @@ -29,7 +31,6 @@
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
Expand All @@ -43,35 +44,30 @@
import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;
import org.apache.hadoop.hbase.util.TableDescriptorChecker;
import org.apache.hadoop.metrics2.MetricsExecutor;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Category({ RegionServerTests.class, LargeTests.class })
@Tag(RegionServerTests.TAG)
@Tag(LargeTests.TAG)
public class TestOpenRegionFailedMemoryLeak {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestOpenRegionFailedMemoryLeak.class);

private static final Logger LOG = LoggerFactory.getLogger(TestOpenRegionFailedMemoryLeak.class);

private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

@BeforeClass
@BeforeAll
public static void startCluster() throws Exception {
Configuration conf = TEST_UTIL.getConfiguration();

// Enable sanity check for coprocessor
conf.setBoolean(TableDescriptorChecker.TABLE_SANITY_CHECKS, true);
}

@AfterClass
@AfterAll
public static void tearDown() throws IOException {
EnvironmentEdgeManagerTestHelper.reset();
LOG.info("Cleaning test directory: " + TEST_UTIL.getDataTestDir());
Expand Down Expand Up @@ -108,12 +104,12 @@ public void testOpenRegionFailedMemoryLeak() throws Exception {
field.setAccessible(true);
BlockingQueue<Runnable> workQueue = (BlockingQueue<Runnable>) field.get(executor);
// there are still two task not cancel, can not cause to memory lack
Assert.assertTrue("ScheduledExecutor#workQueue should equals 2, now is " + workQueue.size()
+ ", please check region is close", 2 == workQueue.size());
assertEquals(2, workQueue.size(), "ScheduledExecutor#workQueue should equals 2, now is "
+ workQueue.size() + " please check region is close");
found = true;
}
}
Assert.assertTrue("can not find workQueue, test failed", found);
assertTrue(found, "can not find workQueue, test failed");
}

}
Loading