diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 058efff8c0..99872d1c2b 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -276,6 +276,11 @@ junit test + + org.mockito + mockito-core + test + com.fasterxml.jackson.core jackson-databind diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java index 9af572831a..b4cf6a36f6 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java @@ -18,9 +18,10 @@ package org.apache.hadoop.hbase.chaos.actions; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; import org.apache.hadoop.hbase.regionserver.DisabledRegionSplitPolicy; import org.apache.hadoop.hbase.regionserver.IncreasingToUpperBoundRegionSplitPolicy; @@ -49,10 +50,11 @@ public class ChangeSplitPolicyAction extends Action { Admin admin = util.getAdmin(); LOG.info("Performing action: Change split policy of table " + tableName); - HTableDescriptor tableDescriptor = admin.getTableDescriptor(tableName); + TableDescriptor tableDescriptor = admin.getDescriptor(tableName); + TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableDescriptor); String chosenPolicy = possiblePolicies[random.nextInt(possiblePolicies.length)]; - tableDescriptor.setRegionSplitPolicyClassName(chosenPolicy); + builder.setRegionSplitPolicyClassName(chosenPolicy); LOG.info("Changing " + tableName + " split policy to " + chosenPolicy); - admin.modifyTable(tableName, tableDescriptor); + admin.modifyTable(builder.build()); } } diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TestChangeSplitPolicyAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TestChangeSplitPolicyAction.java index c3db583ca5..091da9ac6c 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TestChangeSplitPolicyAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TestChangeSplitPolicyAction.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hbase.chaos.actions; -import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.IntegrationTestingUtility; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; @@ -32,9 +32,9 @@ import org.mockito.Mockito; @Category({MediumTests.class}) public class TestChangeSplitPolicyAction extends Action { - private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + private final static IntegrationTestingUtility TEST_UTIL = new IntegrationTestingUtility(); private static ChangeSplitPolicyAction action; - private static Admin admin; + private Admin admin; private TableName tableName = TableName.valueOf("ChangeSplitPolicyAction"); @BeforeClass @@ -47,7 +47,7 @@ public class TestChangeSplitPolicyAction extends Action { } @Before public void setUp() throws Exception { - this.admin = TEST_UTIL.getHBaseAdmin(); + this.admin = TEST_UTIL.getAdmin(); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName); admin.createTable(builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of("fam")).build()); } @@ -55,7 +55,7 @@ public class TestChangeSplitPolicyAction extends Action { @Test public void testChangeSplitPolicyAction() throws Exception { ActionContext ctx = Mockito.mock(ActionContext.class); - Mockito.when(ctx.getHBaseTestingUtility()).thenReturn(TEST_UTIL); + Mockito.when(ctx.getHBaseIntegrationTestingUtility()).thenReturn(TEST_UTIL); Mockito.when(ctx.getHBaseCluster()).thenReturn(TEST_UTIL.getHBaseCluster()); action = new ChangeSplitPolicyAction(tableName); action.init(ctx); diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index 503d4c10dc..e45baf151c 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -34,8 +34,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.hadoop.hbase.ClusterStatus; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestingUtility; import org.apache.hadoop.hbase.InvalidFamilyOperationException; import org.apache.hadoop.hbase.NamespaceExistException; @@ -50,12 +48,15 @@ import org.apache.hadoop.hbase.chaos.actions.RestartRsHoldingMetaAction; import org.apache.hadoop.hbase.chaos.actions.RestartRsHoldingTableAction; import org.apache.hadoop.hbase.chaos.factories.MonkeyConstants; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.RetriesExhaustedException; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.coprocessor.CoprocessorException; import org.apache.hadoop.hbase.filter.KeyOnlyFilter; import org.apache.hadoop.hbase.ipc.FatalConnectionException; @@ -232,15 +233,17 @@ public class IntegrationTestMTTR { } // Create the table. If this fails then fail everything. - HTableDescriptor tableDescriptor = new HTableDescriptor(tableName); + TableDescriptor tableDescriptor = util.getAdmin().getDescriptor(tableName); + TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableDescriptor); // Make the max file size huge so that splits don't happen during the test. - tableDescriptor.setMaxFileSize(Long.MAX_VALUE); + builder.setMaxFileSize(Long.MAX_VALUE); - HColumnDescriptor descriptor = new HColumnDescriptor(FAMILY); - descriptor.setMaxVersions(1); - tableDescriptor.addFamily(descriptor); - util.getAdmin().createTable(tableDescriptor); + ColumnFamilyDescriptorBuilder colDescriptorBldr = + ColumnFamilyDescriptorBuilder.newBuilder(FAMILY); + colDescriptorBldr.setMaxVersions(1); + builder.addColumnFamily(colDescriptorBldr.build()); + util.getAdmin().createTable(builder.build()); // Setup the table for LoadTestTool int ret = loadTool.run(new String[]{"-tn", loadTableName.getNameAsString(), "-init_only"});