From 8a67b2b22dd6a34864f7b11cad0453aa853f8cfa Mon Sep 17 00:00:00 2001 From: Guanghao Zhang Date: Mon, 4 Mar 2019 15:50:28 +0800 Subject: [PATCH] Revert "HBASE-20193 Move TestCreateTableProcedure.testMRegions to a separated file" This reverts commit bf21a9dc335bd758ec96b0c67a9e359c2091b7b5. --- .../procedure/TestCreateTableProcedure.java | 25 ++++++- ...stCreateTableProcedureMuitipleRegions.java | 66 ------------------- 2 files changed, 22 insertions(+), 69 deletions(-) delete mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedureMuitipleRegions.java diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java index a6fea3712c5..155d63c0377 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -48,21 +49,25 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos; + @Category({MasterTests.class, MediumTests.class}) public class TestCreateTableProcedure extends TestTableDDLProcedureBase { @ClassRule public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestCreateTableProcedure.class); + HBaseClassTestRule.forClass(TestCreateTableProcedure.class); + + private static final Logger LOG = LoggerFactory.getLogger(TestCreateTableProcedure.class); private static final String F1 = "f1"; private static final String F2 = "f2"; - @Rule - public TestName name = new TestName(); + @Rule public TestName name = new TestName(); @Test public void testSimpleCreate() throws Exception { @@ -197,6 +202,20 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase { testSimpleCreate(tableName, splitKeys); } + @Test + public void testMRegions() throws Exception { + final byte[][] splitKeys = new byte[500][]; + for (int i = 0; i < splitKeys.length; ++i) { + splitKeys[i] = Bytes.toBytes(String.format("%08d", i)); + } + + final TableDescriptor htd = MasterProcedureTestingUtility.createHTD( + TableName.valueOf("TestMRegions"), F1, F2); + UTIL.getAdmin().createTableAsync(htd, splitKeys) + .get(10, java.util.concurrent.TimeUnit.HOURS); + LOG.info("TABLE CREATED"); + } + public static class CreateTableProcedureOnHDFSFailure extends CreateTableProcedure { private boolean failOnce = false; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedureMuitipleRegions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedureMuitipleRegions.java deleted file mode 100644 index 2aff487e892..00000000000 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedureMuitipleRegions.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.master.procedure; - -import org.apache.hadoop.hbase.HBaseClassTestRule; -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.TableDescriptor; -import org.apache.hadoop.hbase.testclassification.LargeTests; -import org.apache.hadoop.hbase.testclassification.MasterTests; -import org.apache.hadoop.hbase.util.Bytes; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -@Category({ MasterTests.class, LargeTests.class }) -public class TestCreateTableProcedureMuitipleRegions { - - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestCreateTableProcedureMuitipleRegions.class); - - private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); - - private static final String F1 = "f1"; - private static final String F2 = "f2"; - - @BeforeClass - public static void setUp() throws Exception { - UTIL.startMiniCluster(1); - } - - @AfterClass - public static void tearDown() throws Exception { - UTIL.shutdownMiniCluster(); - } - - @Test - public void testMRegions() throws Exception { - byte[][] splitKeys = new byte[500][]; - for (int i = 0; i < splitKeys.length; ++i) { - splitKeys[i] = Bytes.toBytes(String.format("%08d", i)); - } - - TableDescriptor htd = - MasterProcedureTestingUtility.createHTD(TableName.valueOf("TestMRegions"), F1, F2); - UTIL.getAdmin().createTableAsync(htd, splitKeys).get(10, java.util.concurrent.TimeUnit.HOURS); - } -}