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 2018/08/22 23:04:41 UTC
hbase git commit: HBASE-20193 Move
TestCreateTableProcedure.testMRegions to a separated file
Repository: hbase
Updated Branches:
refs/heads/master b0af08bf9 -> 91edbf592
HBASE-20193 Move TestCreateTableProcedure.testMRegions to a separated file
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/91edbf59
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/91edbf59
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/91edbf59
Branch: refs/heads/master
Commit: 91edbf592a9ec51ea2cbc53feb366dd0d13a915b
Parents: b0af08b
Author: zhangduo <zh...@apache.org>
Authored: Wed Aug 22 22:10:58 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Thu Aug 23 07:01:05 2018 +0800
----------------------------------------------------------------------
.../procedure/TestCreateTableProcedure.java | 25 +-------
...TestCreateTableProcedureMuitipleRegions.java | 66 ++++++++++++++++++++
2 files changed, 69 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/91edbf59/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.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 c45cb98..eed1e41 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,7 +22,6 @@ 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;
@@ -49,25 +48,21 @@ 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);
-
- private static final Logger LOG = LoggerFactory.getLogger(TestCreateTableProcedure.class);
+ HBaseClassTestRule.forClass(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 {
@@ -202,20 +197,6 @@ 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;
http://git-wip-us.apache.org/repos/asf/hbase/blob/91edbf59/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/TestCreateTableProcedureMuitipleRegions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedureMuitipleRegions.java
new file mode 100644
index 0000000..2aff487
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedureMuitipleRegions.java
@@ -0,0 +1,66 @@
+/**
+ * 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);
+ }
+}