update

Author: liuxiaocs7

hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckEncryption.java

@@ -28,7 +28,9 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -63,7 +65,7 @@ public class TestHBaseFsckEncryption {
   private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 
   private Configuration conf;
-  private TableDescriptor tableDescriptor;
+  private HTableDescriptor htd;
   private Key cfKey;
 
   @BeforeEach
@@ -83,18 +85,15 @@ public void setUp() throws Exception {
     TEST_UTIL.startMiniCluster(3);
 
     // Create the table
-    TableDescriptorBuilder tableDescriptorBuilder =
-      TableDescriptorBuilder.newBuilder(TableName.valueOf("default", "TestHBaseFsckEncryption"));
-    ColumnFamilyDescriptor columnFamilyDescriptor =
-      ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes("cf")).setEncryptionType(algorithm)
-        .setEncryptionKey(EncryptionUtil.wrapKey(conf,
-          conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY, User.getCurrent().getShortName()),
-          cfKey))
-        .build();
-    tableDescriptorBuilder.setColumnFamily(columnFamilyDescriptor);
-    tableDescriptor = tableDescriptorBuilder.build();
-    TEST_UTIL.getAdmin().createTable(tableDescriptor);
-    TEST_UTIL.waitTableAvailable(tableDescriptor.getTableName(), 5000);
+    htd = new HTableDescriptor(TableName.valueOf("default", "TestHBaseFsckEncryption"));
+    HColumnDescriptor hcd = new HColumnDescriptor("cf");
+    hcd.setEncryptionType(algorithm);
+    hcd.setEncryptionKey(EncryptionUtil.wrapKey(conf,
+      conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY, User.getCurrent().getShortName()),
+      cfKey));
+    htd.addFamily(hcd);
+    TEST_UTIL.getAdmin().createTable(htd);
+    TEST_UTIL.waitTableAvailable(htd.getTableName(), 5000);
   }
 
   @AfterEach
@@ -105,7 +104,7 @@ public void tearDown() throws Exception {
   @Test
   public void testFsckWithEncryption() throws Exception {
     // Populate the table with some data
-    Table table = TEST_UTIL.getConnection().getTable(tableDescriptor.getTableName());
+    Table table = TEST_UTIL.getConnection().getTable(htd.getTableName());
     try {
       byte[] values = { 'A', 'B', 'C', 'D' };
       for (int i = 0; i < values.length; i++) {
@@ -119,18 +118,18 @@ public void testFsckWithEncryption() throws Exception {
       table.close();
     }
     // Flush it
-    TEST_UTIL.getAdmin().flush(tableDescriptor.getTableName());
+    TEST_UTIL.getAdmin().flush(htd.getTableName());
 
     // Verify we have encrypted store files on disk
-    final List<Path> paths = findStorefilePaths(tableDescriptor.getTableName());
+    final List<Path> paths = findStorefilePaths(htd.getTableName());
     assertTrue(paths.size() > 0);
     for (Path path : paths) {
       assertTrue(Bytes.equals(cfKey.getEncoded(), extractHFileKey(path)),
         "Store file " + path + " has incorrect key");
     }
 
     // Insure HBck doesn't consider them corrupt
-    HBaseFsck res = HbckTestingUtil.doHFileQuarantine(conf, tableDescriptor.getTableName());
+    HBaseFsck res = HbckTestingUtil.doHFileQuarantine(conf, htd.getTableName());
     assertEquals(0, res.getRetCode());
     HFileCorruptionChecker hfcc = res.getHFilecorruptionChecker();
     assertEquals(0, hfcc.getCorrupted().size());
@@ -142,7 +141,7 @@ public void testFsckWithEncryption() throws Exception {
   private List<Path> findStorefilePaths(TableName tableName) throws Exception {
     List<Path> paths = new ArrayList<>();
     for (Region region : TEST_UTIL.getRSForFirstRegionInTable(tableName)
-      .getRegions(tableDescriptor.getTableName())) {
+      .getRegions(htd.getTableName())) {
       for (HStore store : ((HRegion) region).getStores()) {
         for (HStoreFile storefile : store.getStorefiles()) {
           paths.add(storefile.getPath());

hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdReadWriteLock.java

@@ -43,9 +43,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@HBaseParameterizedTestTemplate
 @Tag(MiscTests.TAG)
 @Tag(MediumTests.TAG)
+@HBaseParameterizedTestTemplate
 // Medium as it creates 100 threads; seems better to run it isolated
 public class TestIdReadWriteLock {
 

hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestOutputSinkWriter.java

@@ -26,11 +26,12 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.testclassification.RegionServerTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 @Tag(RegionServerTests.TAG)
-@Tag(MediumTests.TAG)
+@Tag(SmallTests.TAG)
 public class TestOutputSinkWriter {
 
   @Test

hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALOpenAfterDNRollingStart.java

@@ -38,7 +38,7 @@
 
 @Tag(RegionServerTests.TAG)
 @Tag(LargeTests.TAG)
-@HBaseParameterizedTestTemplate
+@HBaseParameterizedTestTemplate(name = "{index}: wal={0}")
 public class TestWALOpenAfterDNRollingStart {
 
   private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();