You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2014/04/08 09:28:03 UTC
svn commit: r1585652 - in /hbase/branches/hbase-10070:
hbase-client/src/main/java/org/apache/hadoop/hbase/
hbase-server/src/main/java/org/apache/hadoop/hbase/master/
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/
hbase-server/src/test...
Author: nkeywal
Date: Tue Apr 8 07:28:03 2014
New Revision: 1585652
URL: http://svn.apache.org/r1585652
Log:
HBASE-10591 Sanity check table configuration in createTable (Enis Soztutar)
Modified:
hbase/branches/hbase-10070/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.java
hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java
hbase/branches/hbase-10070/hbase-server/src/test/resources/hbase-site.xml
Modified: hbase/branches/hbase-10070/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=1585652&r1=1585651&r2=1585652&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hbase/branches/hbase-10070/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java Tue Apr 8 07:28:03 2014
@@ -34,7 +34,6 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.regex.Matcher;
-import com.google.protobuf.HBaseZeroCopyByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -54,6 +53,7 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.hbase.util.Writables;
import org.apache.hadoop.io.WritableComparable;
+import com.google.protobuf.HBaseZeroCopyByteString;
import com.google.protobuf.InvalidProtocolBufferException;
/**
@@ -665,7 +665,17 @@ public class HTableDescriptor implements
}
/**
- * This get the class associated with the region split policy which
+ * This sets the class associated with the region split policy which
+ * determines when a region split should occur. The class used by
+ * default is defined in {@link org.apache.hadoop.hbase.regionserver.RegionSplitPolicy}
+ * @param clazz the class name
+ */
+ public void setRegionSplitPolicyClassName(String clazz) {
+ setValue(SPLIT_POLICY, clazz);
+ }
+
+ /**
+ * This gets the class associated with the region split policy which
* determines when a region split should occur. The class used by
* default is defined in {@link org.apache.hadoop.hbase.regionserver.RegionSplitPolicy}
*
Modified: hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1585652&r1=1585651&r2=1585652&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue Apr 8 07:28:03 2014
@@ -51,6 +51,7 @@ import org.apache.hadoop.hbase.Abortable
import org.apache.hadoop.hbase.Chore;
import org.apache.hadoop.hbase.ClusterId;
import org.apache.hadoop.hbase.ClusterStatus;
+import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseIOException;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
@@ -116,10 +117,10 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair;
+import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionServerInfo;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
-import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ProcedureDescription;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.AddColumnResponse;
@@ -147,6 +148,8 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableCatalogJanitorResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.EnableTableResponse;
+import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequest;
+import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest;
@@ -163,6 +166,8 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningResponse;
+import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequest;
+import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsRestoreSnapshotDoneResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;
@@ -197,10 +202,6 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.StopMasterResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.UnassignRegionResponse;
-import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureRequest;
-import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ExecProcedureResponse;
-import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneRequest;
-import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsProcedureDoneResponse;
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos;
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdRequest;
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.GetLastFlushedSequenceIdResponse;
@@ -210,6 +211,7 @@ import org.apache.hadoop.hbase.protobuf.
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse;
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest;
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorResponse;
+import org.apache.hadoop.hbase.regionserver.RegionSplitPolicy;
import org.apache.hadoop.hbase.replication.regionserver.Replication;
import org.apache.hadoop.hbase.security.UserProvider;
import org.apache.hadoop.hbase.snapshot.ClientSnapshotDescriptionUtils;
@@ -1742,7 +1744,7 @@ MasterServices, Server {
HRegionInfo[] newRegions = getHRegionInfos(hTableDescriptor, splitKeys);
checkInitialized();
- checkCompression(hTableDescriptor);
+ sanityCheckTableDescriptor(hTableDescriptor);
if (cpHost != null) {
cpHost.preCreateTable(hTableDescriptor, newRegions);
}
@@ -1756,6 +1758,97 @@ MasterServices, Server {
}
+ /**
+ * Checks whether the table conforms to some sane limits, and configured
+ * values (compression, etc) work. Throws an exception if something is wrong.
+ * @throws IOException
+ */
+ private void sanityCheckTableDescriptor(final HTableDescriptor htd) throws IOException {
+ final String CONF_KEY = "hbase.table.sanity.checks";
+ if (!conf.getBoolean(CONF_KEY, true)) {
+ return;
+ }
+ String tableVal = htd.getConfigurationValue(CONF_KEY);
+ if (tableVal != null && !Boolean.valueOf(tableVal)) {
+ return;
+ }
+
+ // check max file size
+ long maxFileSizeLowerLimit = 2 * 1024 * 1024L; // 2M is the default lower limit
+ long maxFileSize = htd.getMaxFileSize();
+ if (maxFileSize < 0) {
+ maxFileSize = conf.getLong(HConstants.HREGION_MAX_FILESIZE, maxFileSizeLowerLimit);
+ }
+ if (maxFileSize < conf.getLong("hbase.hregion.max.filesize.limit", maxFileSizeLowerLimit)) {
+ throw new DoNotRetryIOException("MAX_FILESIZE for table descriptor or "
+ + "\"hbase.hregion.max.filesize\" (" + maxFileSize
+ + ") is too small, which might cause over splitting into unmanageable "
+ + "number of regions. Set " + CONF_KEY + " to false at conf or table descriptor "
+ + "if you want to bypass sanity checks");
+ }
+
+ // check flush size
+ long flushSizeLowerLimit = 1024 * 1024L; // 1M is the default lower limit
+ long flushSize = htd.getMemStoreFlushSize();
+ if (flushSize < 0) {
+ flushSize = conf.getLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, flushSizeLowerLimit);
+ }
+ if (flushSize < conf.getLong("hbase.hregion.memstore.flush.size.limit", flushSizeLowerLimit)) {
+ throw new DoNotRetryIOException("MEMSTORE_FLUSHSIZE for table descriptor or "
+ + "\"hbase.hregion.memstore.flush.size\" ("+flushSize+") is too small, which might cause"
+ + " very frequent flushing. Set " + CONF_KEY + " to false at conf or table descriptor "
+ + "if you want to bypass sanity checks");
+ }
+
+ // check split policy class can be loaded
+ try {
+ RegionSplitPolicy.getSplitPolicyClass(htd, conf);
+ } catch (Exception ex) {
+ throw new DoNotRetryIOException(ex);
+ }
+
+ // check compression can be loaded
+ checkCompression(htd);
+
+ // check that we have at least 1 CF
+ if (htd.getColumnFamilies().length == 0) {
+ throw new DoNotRetryIOException("Table should have at least one column family "
+ + "Set "+CONF_KEY+" at conf or table descriptor if you want to bypass sanity checks");
+ }
+
+ for (HColumnDescriptor hcd : htd.getColumnFamilies()) {
+ if (hcd.getTimeToLive() <= 0) {
+ throw new DoNotRetryIOException("TTL for column family " + hcd.getNameAsString()
+ + " must be positive. Set " + CONF_KEY + " to false at conf or table descriptor "
+ + "if you want to bypass sanity checks");
+ }
+
+ // check blockSize
+ if (hcd.getBlocksize() < 1024 || hcd.getBlocksize() > 16 * 1024 * 1024) {
+ throw new DoNotRetryIOException("Block size for column family " + hcd.getNameAsString()
+ + " must be between 1K and 16MB Set "+CONF_KEY+" to false at conf or table descriptor "
+ + "if you want to bypass sanity checks");
+ }
+
+ // check versions
+ if (hcd.getMinVersions() < 0) {
+ throw new DoNotRetryIOException("Min versions for column family " + hcd.getNameAsString()
+ + " must be positive. Set " + CONF_KEY + " to false at conf or table descriptor "
+ + "if you want to bypass sanity checks");
+ }
+ // max versions already being checked
+
+ // check replication scope
+ if (hcd.getScope() < 0) {
+ throw new DoNotRetryIOException("Replication scope for column family "
+ + hcd.getNameAsString() + " must be positive. Set " + CONF_KEY + " to false at conf "
+ + "or table descriptor if you want to bypass sanity checks");
+ }
+
+ // TODO: should we check coprocessors and encryption ?
+ }
+ }
+
private void checkCompression(final HTableDescriptor htd)
throws IOException {
if (!this.masterCheckCompression) return;
@@ -2038,7 +2131,7 @@ MasterServices, Server {
public void modifyTable(final TableName tableName, final HTableDescriptor descriptor)
throws IOException {
checkInitialized();
- checkCompression(descriptor);
+ sanityCheckTableDescriptor(descriptor);
if (cpHost != null) {
cpHost.preModifyTable(tableName, descriptor);
}
Modified: hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.java?rev=1585652&r1=1585651&r2=1585652&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.java Tue Apr 8 07:28:03 2014
@@ -105,7 +105,7 @@ public abstract class RegionSplitPolicy
return policy;
}
- static Class<? extends RegionSplitPolicy> getSplitPolicyClass(
+ public static Class<? extends RegionSplitPolicy> getSplitPolicyClass(
HTableDescriptor htd, Configuration conf) throws IOException {
String className = htd.getRegionSplitPolicyClassName();
if (className == null) {
Modified: hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java?rev=1585652&r1=1585651&r2=1585652&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java Tue Apr 8 07:28:03 2014
@@ -495,7 +495,9 @@ public class TestZooKeeper {
Bytes.toBytes("c"), Bytes.toBytes("d"), Bytes.toBytes("e"), Bytes.toBytes("f"),
Bytes.toBytes("g"), Bytes.toBytes("h"), Bytes.toBytes("i"), Bytes.toBytes("j") };
String tableName = "testRegionAssignmentAfterMasterRecoveryDueToZKExpiry";
- admin.createTable(new HTableDescriptor(TableName.valueOf(tableName)), SPLIT_KEYS);
+ HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(tableName));
+ htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
+ admin.createTable(htd, SPLIT_KEYS);
ZooKeeperWatcher zooKeeperWatcher = HBaseTestingUtility.getZooKeeperWatcher(TEST_UTIL);
ZKAssign.blockUntilNoRIT(zooKeeperWatcher);
m.getZooKeeperWatcher().close();
Modified: hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1585652&r1=1585651&r2=1585652&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Tue Apr 8 07:28:03 2014
@@ -197,6 +197,7 @@ public class TestAdmin {
exception = null;
try {
HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(nonexistent));
+ htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
this.admin.modifyTable(htd.getTableName(), htd);
} catch (IOException e) {
exception = e;
@@ -1156,8 +1157,12 @@ public class TestAdmin {
@Test (timeout=300000)
public void testTableNameClash() throws Exception {
String name = "testTableNameClash";
- admin.createTable(new HTableDescriptor(TableName.valueOf(name + "SOMEUPPERCASE")));
- admin.createTable(new HTableDescriptor(TableName.valueOf(name)));
+ HTableDescriptor htd1 = new HTableDescriptor(TableName.valueOf(name + "SOMEUPPERCASE"));
+ HTableDescriptor htd2 = new HTableDescriptor(TableName.valueOf(name));
+ htd1.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
+ htd2.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
+ admin.createTable(htd1);
+ admin.createTable(htd2);
// Before fix, below would fail throwing a NoServerForRegionException.
new HTable(TEST_UTIL.getConfiguration(), name).close();
}
@@ -1181,8 +1186,9 @@ public class TestAdmin {
byte [] startKey = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
byte [] endKey = { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9 };
HBaseAdmin hbaseadmin = new HBaseAdmin(TEST_UTIL.getConfiguration());
- hbaseadmin.createTable(new HTableDescriptor(TableName.valueOf(name)), startKey, endKey,
- expectedRegions);
+ HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(name));
+ htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
+ hbaseadmin.createTable(htd, startKey, endKey, expectedRegions);
hbaseadmin.close();
} finally {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, oldTimeout);
Modified: hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java?rev=1585652&r1=1585651&r2=1585652&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java (original)
+++ hbase/branches/hbase-10070/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java Tue Apr 8 07:28:03 2014
@@ -36,6 +36,7 @@ public class TestFromClientSideWithCopro
Configuration conf = TEST_UTIL.getConfiguration();
conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
MultiRowMutationEndpoint.class.getName(), NoOpScanPolicyObserver.class.getName());
+ conf.setBoolean("hbase.table.sanity.checks", true); // enable for below tests
// We need more than one region server in this test
TEST_UTIL.startMiniCluster(SLAVES);
}
Modified: hbase/branches/hbase-10070/hbase-server/src/test/resources/hbase-site.xml
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-10070/hbase-server/src/test/resources/hbase-site.xml?rev=1585652&r1=1585651&r2=1585652&view=diff
==============================================================================
--- hbase/branches/hbase-10070/hbase-server/src/test/resources/hbase-site.xml (original)
+++ hbase/branches/hbase-10070/hbase-server/src/test/resources/hbase-site.xml Tue Apr 8 07:28:03 2014
@@ -141,4 +141,10 @@
version is X.X.X-SNAPSHOT"
</description>
</property>
+ <property>
+ <name>hbase.table.sanity.checks</name>
+ <value>false</value>
+ <description>Skip sanity checks in tests
+ </description>
+ </property>
</configuration>