HBASE-16778 Move testIllegalTableDescriptor out from TestFromClientSide
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/eb33b60a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/eb33b60a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/eb33b60a Branch: refs/heads/hbase-12439 Commit: eb33b60a954d8695f07b5ce71501760d732a85b6 Parents: b548d49 Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Wed Oct 5 20:04:18 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Wed Oct 5 20:04:18 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/client/TestFromClientSide.java | 148 ------------- .../client/TestIllegalTableDescriptor.java | 218 +++++++++++++++++++ 2 files changed, 218 insertions(+), 148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/eb33b60a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java index 50a566a..6bd9ccd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java @@ -88,7 +88,6 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.hfile.BlockCache; import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; -import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType; @@ -107,10 +106,8 @@ import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.Pair; -import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.apache.log4j.spi.LoggingEvent; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -5293,151 +5290,6 @@ public class TestFromClientSide { } @Test - public void testIllegalTableDescriptor() throws Exception { - HTableDescriptor htd = new HTableDescriptor(TableName.valueOf("testIllegalTableDescriptor")); - HColumnDescriptor hcd = new HColumnDescriptor(FAMILY); - - // create table with 0 families - checkTableIsIllegal(htd); - htd.addFamily(hcd); - checkTableIsLegal(htd); - - htd.setMaxFileSize(1024); // 1K - checkTableIsIllegal(htd); - htd.setMaxFileSize(0); - checkTableIsIllegal(htd); - htd.setMaxFileSize(1024 * 1024 * 1024); // 1G - checkTableIsLegal(htd); - - htd.setMemStoreFlushSize(1024); - checkTableIsIllegal(htd); - htd.setMemStoreFlushSize(0); - checkTableIsIllegal(htd); - htd.setMemStoreFlushSize(128 * 1024 * 1024); // 128M - checkTableIsLegal(htd); - - htd.setRegionSplitPolicyClassName("nonexisting.foo.class"); - checkTableIsIllegal(htd); - htd.setRegionSplitPolicyClassName(null); - checkTableIsLegal(htd); - - hcd.setBlocksize(0); - checkTableIsIllegal(htd); - hcd.setBlocksize(1024 * 1024 * 128); // 128M - checkTableIsIllegal(htd); - hcd.setBlocksize(1024); - checkTableIsLegal(htd); - - hcd.setTimeToLive(0); - checkTableIsIllegal(htd); - hcd.setTimeToLive(-1); - checkTableIsIllegal(htd); - hcd.setTimeToLive(1); - checkTableIsLegal(htd); - - hcd.setMinVersions(-1); - checkTableIsIllegal(htd); - hcd.setMinVersions(3); - try { - hcd.setMaxVersions(2); - fail(); - } catch (IllegalArgumentException ex) { - // expected - hcd.setMaxVersions(10); - } - checkTableIsLegal(htd); - - // HBASE-13776 Setting illegal versions for HColumnDescriptor - // does not throw IllegalArgumentException - // finally, minVersions must be less than or equal to maxVersions - hcd.setMaxVersions(4); - hcd.setMinVersions(5); - checkTableIsIllegal(htd); - hcd.setMinVersions(3); - - hcd.setScope(-1); - checkTableIsIllegal(htd); - hcd.setScope(0); - checkTableIsLegal(htd); - - try { - hcd.setDFSReplication((short) -1); - fail("Illegal value for setDFSReplication did not throw"); - } catch (IllegalArgumentException e) { - // pass - } - // set an illegal DFS replication value by hand - hcd.setValue(HColumnDescriptor.DFS_REPLICATION, "-1"); - checkTableIsIllegal(htd); - try { - hcd.setDFSReplication((short) -1); - fail("Should throw exception if an illegal value is explicitly being set"); - } catch (IllegalArgumentException e) { - // pass - } - - // check the conf settings to disable sanity checks - htd.setMemStoreFlushSize(0); - - // Check that logs warn on invalid table but allow it. - ListAppender listAppender = new ListAppender(); - Logger log = Logger.getLogger(HMaster.class); - log.addAppender(listAppender); - log.setLevel(Level.WARN); - - htd.setConfiguration("hbase.table.sanity.checks", Boolean.FALSE.toString()); - checkTableIsLegal(htd); - - assertFalse(listAppender.getMessages().isEmpty()); - assertTrue(listAppender.getMessages().get(0).startsWith("MEMSTORE_FLUSHSIZE for table " - + "descriptor or \"hbase.hregion.memstore.flush.size\" (0) is too small, which might " - + "cause very frequent flushing.")); - - log.removeAppender(listAppender); - } - - private static class ListAppender extends AppenderSkeleton { - private final List<String> messages = new ArrayList<String>(); - - @Override - protected void append(LoggingEvent event) { - messages.add(event.getMessage().toString()); - } - - @Override - public void close() { - } - - @Override - public boolean requiresLayout() { - return false; - } - - public List<String> getMessages() { - return messages; - } - } - - private void checkTableIsLegal(HTableDescriptor htd) throws IOException { - Admin admin = TEST_UTIL.getHBaseAdmin(); - admin.createTable(htd); - assertTrue(admin.tableExists(htd.getTableName())); - admin.disableTable(htd.getTableName()); - admin.deleteTable(htd.getTableName()); - } - - private void checkTableIsIllegal(HTableDescriptor htd) throws IOException { - Admin admin = TEST_UTIL.getHBaseAdmin(); - try { - admin.createTable(htd); - fail(); - } catch(Exception ex) { - // should throw ex - } - assertFalse(admin.tableExists(htd.getTableName())); - } - - @Test public void testRawScanRespectsVersions() throws Exception { TableName TABLE = TableName.valueOf("testRawScan"); Table table = TEST_UTIL.createTable(TABLE, FAMILY); http://git-wip-us.apache.org/repos/asf/hbase/blob/eb33b60a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java new file mode 100644 index 0000000..470fc5c --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java @@ -0,0 +1,218 @@ +/** + * + * 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.client; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.master.HMaster; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.log4j.AppenderSkeleton; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.spi.LoggingEvent; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +@Category({LargeTests.class, ClientTests.class}) +public class TestIllegalTableDescriptor { + // NOTE: Increment tests were moved to their own class, TestIncrementsFromClientSide. + private static final Log LOG = LogFactory.getLog(TestFromClientSide.class); + protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + + private static byte [] FAMILY = Bytes.toBytes("testFamily"); + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + Configuration conf = TEST_UTIL.getConfiguration(); + conf.setBoolean("hbase.table.sanity.checks", true); // enable for below tests + // We need more than one region server in this test + TEST_UTIL.startMiniCluster(1); + } + + @AfterClass + public static void tearDownAfterClass() throws Exception { + TEST_UTIL.shutdownMiniCluster(); + } + + @Test + public void testIllegalTableDescriptor() throws Exception { + HTableDescriptor htd = new HTableDescriptor(TableName.valueOf("testIllegalTableDescriptor")); + HColumnDescriptor hcd = new HColumnDescriptor(FAMILY); + + // create table with 0 families + checkTableIsIllegal(htd); + htd.addFamily(hcd); + checkTableIsLegal(htd); + + htd.setMaxFileSize(1024); // 1K + checkTableIsIllegal(htd); + htd.setMaxFileSize(0); + checkTableIsIllegal(htd); + htd.setMaxFileSize(1024 * 1024 * 1024); // 1G + checkTableIsLegal(htd); + + htd.setMemStoreFlushSize(1024); + checkTableIsIllegal(htd); + htd.setMemStoreFlushSize(0); + checkTableIsIllegal(htd); + htd.setMemStoreFlushSize(128 * 1024 * 1024); // 128M + checkTableIsLegal(htd); + + htd.setRegionSplitPolicyClassName("nonexisting.foo.class"); + checkTableIsIllegal(htd); + htd.setRegionSplitPolicyClassName(null); + checkTableIsLegal(htd); + + hcd.setBlocksize(0); + checkTableIsIllegal(htd); + hcd.setBlocksize(1024 * 1024 * 128); // 128M + checkTableIsIllegal(htd); + hcd.setBlocksize(1024); + checkTableIsLegal(htd); + + hcd.setTimeToLive(0); + checkTableIsIllegal(htd); + hcd.setTimeToLive(-1); + checkTableIsIllegal(htd); + hcd.setTimeToLive(1); + checkTableIsLegal(htd); + + hcd.setMinVersions(-1); + checkTableIsIllegal(htd); + hcd.setMinVersions(3); + try { + hcd.setMaxVersions(2); + fail(); + } catch (IllegalArgumentException ex) { + // expected + hcd.setMaxVersions(10); + } + checkTableIsLegal(htd); + + // HBASE-13776 Setting illegal versions for HColumnDescriptor + // does not throw IllegalArgumentException + // finally, minVersions must be less than or equal to maxVersions + hcd.setMaxVersions(4); + hcd.setMinVersions(5); + checkTableIsIllegal(htd); + hcd.setMinVersions(3); + + hcd.setScope(-1); + checkTableIsIllegal(htd); + hcd.setScope(0); + checkTableIsLegal(htd); + + try { + hcd.setDFSReplication((short) -1); + fail("Illegal value for setDFSReplication did not throw"); + } catch (IllegalArgumentException e) { + // pass + } + // set an illegal DFS replication value by hand + hcd.setValue(HColumnDescriptor.DFS_REPLICATION, "-1"); + checkTableIsIllegal(htd); + try { + hcd.setDFSReplication((short) -1); + fail("Should throw exception if an illegal value is explicitly being set"); + } catch (IllegalArgumentException e) { + // pass + } + + // check the conf settings to disable sanity checks + htd.setMemStoreFlushSize(0); + + // Check that logs warn on invalid table but allow it. + ListAppender listAppender = new ListAppender(); + Logger log = Logger.getLogger(HMaster.class); + log.addAppender(listAppender); + log.setLevel(Level.WARN); + + htd.setConfiguration("hbase.table.sanity.checks", Boolean.FALSE.toString()); + checkTableIsLegal(htd); + + assertFalse(listAppender.getMessages().isEmpty()); + assertTrue(listAppender.getMessages().get(0).startsWith("MEMSTORE_FLUSHSIZE for table " + + "descriptor or \"hbase.hregion.memstore.flush.size\" (0) is too small, which might " + + "cause very frequent flushing.")); + + log.removeAppender(listAppender); + } + + private void checkTableIsLegal(HTableDescriptor htd) throws IOException { + Admin admin = TEST_UTIL.getHBaseAdmin(); + admin.createTable(htd); + assertTrue(admin.tableExists(htd.getTableName())); + TEST_UTIL.deleteTable(htd.getTableName()); + } + + private void checkTableIsIllegal(HTableDescriptor htd) throws IOException { + Admin admin = TEST_UTIL.getHBaseAdmin(); + try { + admin.createTable(htd); + fail(); + } catch(Exception ex) { + // should throw ex + } + assertFalse(admin.tableExists(htd.getTableName())); + } + + private static class ListAppender extends AppenderSkeleton { + private final List<String> messages = new ArrayList<String>(); + + @Override + protected void append(LoggingEvent event) { + messages.add(event.getMessage().toString()); + } + + @Override + public void close() { + } + + @Override + public boolean requiresLayout() { + return false; + } + + public List<String> getMessages() { + return messages; + } + } +} \ No newline at end of file
