You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/03/16 05:24:53 UTC
hbase git commit: HBASE-15456 Revert due to TestCloseRegionHandler
failure
Repository: hbase
Updated Branches:
refs/heads/branch-1 f8bcb5447 -> a00ed93fa
HBASE-15456 Revert due to TestCloseRegionHandler failure
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a00ed93f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a00ed93f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a00ed93f
Branch: refs/heads/branch-1
Commit: a00ed93faef7ce10bfd84f7e436c8a7912ce3725
Parents: f8bcb54
Author: tedyu <yu...@gmail.com>
Authored: Tue Mar 15 21:24:37 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Tue Mar 15 21:24:37 2016 -0700
----------------------------------------------------------------------
.../master/procedure/CreateTableProcedure.java | 9 -------
.../master/procedure/ModifyTableProcedure.java | 7 ------
.../hadoop/hbase/regionserver/HRegion.java | 7 ------
.../procedure/TestCreateTableProcedure.java | 24 -------------------
.../procedure/TestModifyTableProcedure.java | 24 ++-----------------
.../hbase/namespace/TestNamespaceAuditor.java | 25 --------------------
6 files changed, 2 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a00ed93f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
index c351cea..6d4955c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
@@ -30,7 +30,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.MetaTableAccessor;
@@ -303,14 +302,6 @@ public class CreateTableProcedure
return false;
}
}
-
- // check that we have at least 1 CF
- if (hTableDescriptor.getColumnFamilies().length == 0) {
- setFailure("master-create-table", new DoNotRetryIOException("Table " +
- getTableName().toString() + " should have at least one column family."));
- return false;
- }
-
return true;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/a00ed93f/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java
index f1f6457..ddbc9ef 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
@@ -287,12 +286,6 @@ public class ModifyTableProcedure
throw new TableNotFoundException(getTableName());
}
- // check that we have at least 1 CF
- if (modifiedHTableDescriptor.getColumnFamilies().length == 0) {
- throw new DoNotRetryIOException("Table " + getTableName().toString() +
- " should have at least one column family.");
- }
-
// In order to update the descriptor, we need to retrieve the old descriptor for comparison.
this.unmodifiedHTableDescriptor =
env.getMasterServices().getTableDescriptors().get(getTableName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/a00ed93f/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index e3755c8..d402efd 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -798,13 +798,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
* @throws IOException e
*/
private long initialize(final CancelableProgressable reporter) throws IOException {
-
- //Refuse to open the region if there is no column family in the table
- if (htableDescriptor.getColumnFamilies().length == 0) {
- throw new DoNotRetryIOException("Table " + htableDescriptor.getNameAsString() +
- " should have at least one column family.");
- }
-
MonitoredTask status = TaskMonitor.get().createStatus("Initializing region " + this);
long nextSeqId = -1;
try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a00ed93f/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 2841847..73843e0 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
@@ -23,12 +23,10 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.ProcedureInfo;
import org.apache.hadoop.hbase.TableExistsException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
@@ -44,7 +42,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@Category(MediumTests.class)
@@ -121,27 +118,6 @@ public class TestCreateTableProcedure {
UTIL.getHBaseCluster().getMaster(), tableName, regions, "f1", "f2");
}
- @Test(timeout=60000)
- public void testCreateWithoutColumnFamily() throws Exception {
- final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
- final TableName tableName = TableName.valueOf("testCreateWithoutColumnFamily");
- // create table with 0 families will fail
- final HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName);
-
- // disable sanity check
- htd.setConfiguration("hbase.table.sanity.checks", Boolean.FALSE.toString());
- final HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, null);
-
- long procId =
- ProcedureTestingUtility.submitAndWait(procExec,
- new CreateTableProcedure(procExec.getEnvironment(), htd, regions));
- final ProcedureInfo result = procExec.getResult(procId);
- assertEquals(true, result.isFailed());
- Throwable cause = ProcedureTestingUtility.getExceptionCause(result);
- assertTrue("expected DoNotRetryIOException, got " + cause,
- cause instanceof DoNotRetryIOException);
- }
-
@Test(timeout=60000, expected=TableExistsException.class)
public void testCreateExisting() throws Exception {
final TableName tableName = TableName.valueOf("testCreateExisting");
http://git-wip-us.apache.org/repos/asf/hbase/blob/a00ed93f/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
index ae43867..59229d4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
@@ -25,13 +25,11 @@ import static org.junit.Assert.assertTrue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.ProcedureInfo;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
@@ -169,13 +167,12 @@ public class TestModifyTableProcedure {
@Test(timeout = 60000)
public void testModifyTableDeleteCF() throws Exception {
- final TableName tableName = TableName.valueOf("testModifyTableDeleteCF");
- final String cf1 = "cf1";
+ final TableName tableName = TableName.valueOf("testModifyTableAddCF");
final String cf2 = "cf2";
final String cf3 = "cf3";
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
- MasterProcedureTestingUtility.createTable(procExec, tableName, null, cf1, cf2, cf3);
+ MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf1", cf2, cf3);
HTableDescriptor currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
assertEquals(3, currentHtd.getFamiliesKeys().size());
@@ -198,8 +195,6 @@ public class TestModifyTableProcedure {
HTableDescriptor htd2 =
new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
htd2.removeFamily(cf3.getBytes());
- // Disable Sanity check
- htd2.setConfiguration("hbase.table.sanity.checks", Boolean.FALSE.toString());
long procId2 =
ProcedureTestingUtility.submitAndWait(procExec,
@@ -209,21 +204,6 @@ public class TestModifyTableProcedure {
currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
assertEquals(1, currentHtd.getFamiliesKeys().size());
assertFalse(currentHtd.hasFamily(cf3.getBytes()));
-
- //Removing the last family will fail
- HTableDescriptor htd3 =
- new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
- htd3.removeFamily(cf1.getBytes());
- long procId3 =
- ProcedureTestingUtility.submitAndWait(procExec,
- new ModifyTableProcedure(procExec.getEnvironment(), htd3));
- final ProcedureInfo result = procExec.getResult(procId3);
- assertEquals(true, result.isFailed());
- Throwable cause = ProcedureTestingUtility.getExceptionCause(result);
- assertTrue("expected DoNotRetryIOException, got " + cause,
- cause instanceof DoNotRetryIOException);
- assertEquals(1, currentHtd.getFamiliesKeys().size());
- assertTrue(currentHtd.hasFamily(cf1.getBytes()));
}
@Test(timeout=60000)
http://git-wip-us.apache.org/repos/asf/hbase/blob/a00ed93f/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
index 0875f56..b6fab17 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
@@ -144,17 +144,12 @@ public class TestNamespaceAuditor {
ADMIN.createNamespace(nspDesc);
assertNotNull("Namespace descriptor found null.", ADMIN.getNamespaceDescriptor(nsp));
assertEquals(ADMIN.listNamespaceDescriptors().length, 3);
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
-
HTableDescriptor tableDescOne =
new HTableDescriptor(TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table1"));
- tableDescOne.addFamily(fam1);
HTableDescriptor tableDescTwo =
new HTableDescriptor(TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table2"));
- tableDescTwo.addFamily(fam1);
HTableDescriptor tableDescThree =
new HTableDescriptor(TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table3"));
- tableDescThree.addFamily(fam1);
ADMIN.createTable(tableDescOne);
boolean constraintViolated = false;
try {
@@ -253,13 +248,10 @@ public class TestNamespaceAuditor {
assertNotNull("Namespace descriptor found null.", ADMIN.getNamespaceDescriptor(namespace));
NamespaceTableAndRegionInfo stateInfo = getNamespaceState(nspDesc.getName());
assertNotNull("Namespace state found null for " + namespace, stateInfo);
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
HTableDescriptor tableDescOne =
new HTableDescriptor(TableName.valueOf(namespace + TableName.NAMESPACE_DELIM + "table1"));
- tableDescOne.addFamily(fam1);
HTableDescriptor tableDescTwo =
new HTableDescriptor(TableName.valueOf(namespace + TableName.NAMESPACE_DELIM + "table2"));
- tableDescTwo.addFamily(fam1);
ADMIN.createTable(tableDescOne);
ADMIN.createTable(tableDescTwo, Bytes.toBytes("AAA"), Bytes.toBytes("ZZZ"), 5);
stateInfo = getNamespaceState(nspDesc.getName());
@@ -597,13 +589,9 @@ public class TestNamespaceAuditor {
TableName tableOne = TableName.valueOf(nsp1 + TableName.NAMESPACE_DELIM + "table1");
TableName tableTwo = TableName.valueOf(nsp1 + TableName.NAMESPACE_DELIM + "table2");
TableName tableThree = TableName.valueOf(nsp1 + TableName.NAMESPACE_DELIM + "table3");
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
HTableDescriptor tableDescOne = new HTableDescriptor(tableOne);
- tableDescOne.addFamily(fam1);
HTableDescriptor tableDescTwo = new HTableDescriptor(tableTwo);
- tableDescTwo.addFamily(fam1);
HTableDescriptor tableDescThree = new HTableDescriptor(tableThree);
- tableDescThree.addFamily(fam1);
ADMIN.createTable(tableDescOne, Bytes.toBytes("1"), Bytes.toBytes("1000"), 3);
ADMIN.createTable(tableDescTwo, Bytes.toBytes("1"), Bytes.toBytes("1000"), 3);
ADMIN.createTable(tableDescThree, Bytes.toBytes("1"), Bytes.toBytes("1000"), 4);
@@ -692,13 +680,10 @@ public class TestNamespaceAuditor {
ADMIN.createNamespace(nspDesc);
assertNotNull("Namespace descriptor found null.", ADMIN.getNamespaceDescriptor(nsp));
assertEquals(ADMIN.listNamespaceDescriptors().length, 3);
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
HTableDescriptor tableDescOne =
new HTableDescriptor(TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table1"));
- tableDescOne.addFamily(fam1);
HTableDescriptor tableDescTwo =
new HTableDescriptor(TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table2"));
- tableDescTwo.addFamily(fam1);
ADMIN.createTable(tableDescOne);
ADMIN.createTable(tableDescTwo, Bytes.toBytes("AAA"), Bytes.toBytes("ZZZ"), 4);
}
@@ -713,9 +698,7 @@ public class TestNamespaceAuditor {
assertNotNull("Namespace descriptor found null.", ADMIN.getNamespaceDescriptor(nsp));
TableName tableName = TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table1");
TableName cloneTableName = TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table2");
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
HTableDescriptor tableDescOne = new HTableDescriptor(tableName);
- tableDescOne.addFamily(fam1);
ADMIN.createTable(tableDescOne);
String snapshot = "snapshot_testTableQuotaExceedWithCloneSnapshot";
ADMIN.snapshot(snapshot, tableName);
@@ -733,10 +716,7 @@ public class TestNamespaceAuditor {
assertNotNull("Namespace descriptor found null.", ADMIN.getNamespaceDescriptor(nsp));
TableName tableName = TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table1");
TableName cloneTableName = TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table2");
-
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
HTableDescriptor tableDescOne = new HTableDescriptor(tableName);
- tableDescOne.addFamily(fam1);
ADMIN.createTable(tableDescOne, Bytes.toBytes("AAA"), Bytes.toBytes("ZZZ"), 4);
String snapshot = "snapshot_testCloneSnapshot";
@@ -771,8 +751,6 @@ public class TestNamespaceAuditor {
assertNotNull("Namespace descriptor found null.", ADMIN.getNamespaceDescriptor(nsp));
TableName tableName1 = TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table1");
HTableDescriptor tableDescOne = new HTableDescriptor(tableName1);
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
- tableDescOne.addFamily(fam1);
ADMIN.createTable(tableDescOne, Bytes.toBytes("AAA"), Bytes.toBytes("ZZZ"), 4);
NamespaceTableAndRegionInfo nstate = getNamespaceState(nsp);
@@ -808,9 +786,6 @@ public class TestNamespaceAuditor {
assertNotNull("Namespace descriptor found null.", ndesc);
TableName tableName1 = TableName.valueOf(nsp + TableName.NAMESPACE_DELIM + "table1");
HTableDescriptor tableDescOne = new HTableDescriptor(tableName1);
- HColumnDescriptor fam1 = new HColumnDescriptor("fam1");
- tableDescOne.addFamily(fam1);
-
ADMIN.createTable(tableDescOne, Bytes.toBytes("AAA"), Bytes.toBytes("ZZZ"), 4);
NamespaceTableAndRegionInfo nstate = getNamespaceState(nsp);