You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/12/05 01:41:17 UTC
[1/4] hbase git commit: Revert "HBASE-4907 NPE of MobUtils.hasMobColumns in Build failed in Jenkins: HBase-Trunk_matrix » latest1.8,Hadoop #513 (Jingcheng Du)" Revert because I pitched this against the wrong JIRA number!
Repository: hbase
Updated Branches:
refs/heads/master 26dd0d17f -> c6b8e6f1a
Revert "HBASE-4907 NPE of MobUtils.hasMobColumns in Build failed in Jenkins: HBase-Trunk_matrix » latest1.8,Hadoop #513 (Jingcheng Du)"
Revert because I pitched this against the wrong JIRA number!
This reverts commit 03e4712f0ca08d57586b3fc4d93cf02c999515d8.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/35a7b56e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/35a7b56e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/35a7b56e
Branch: refs/heads/master
Commit: 35a7b56e530f3e4a12f1968df5aee9d3b63815bb
Parents: 26dd0d1
Author: stack <st...@apache.org>
Authored: Fri Dec 4 16:36:46 2015 -0800
Committer: stack <st...@apache.org>
Committed: Fri Dec 4 16:36:46 2015 -0800
----------------------------------------------------------------------
.../master/procedure/DeleteTableProcedure.java | 23 +++++---
.../procedure/TestCreateTableProcedure.java | 58 ++++++++------------
2 files changed, 39 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/35a7b56e/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
index 1e86254..4b95fa8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotDisabledException;
@@ -344,13 +345,19 @@ public class DeleteTableProcedure
LOG.debug("Table '" + tableName + "' archived!");
}
- // Archive mob data
- Path mobTableDir = FSUtils.getTableDir(new Path(mfs.getRootDir(), MobConstants.MOB_DIR_NAME),
- tableName);
- Path regionDir =
- new Path(mobTableDir, MobUtils.getMobRegionInfo(tableName).getEncodedName());
- if (fs.exists(regionDir)) {
- HFileArchiver.archiveRegion(fs, mfs.getRootDir(), mobTableDir, regionDir);
+ // Archive the mob data if there is a mob-enabled column
+ HTableDescriptor htd = env.getMasterServices().getTableDescriptors().get(tableName);
+ boolean hasMob = MobUtils.hasMobColumns(htd);
+ Path mobTableDir = null;
+ if (hasMob) {
+ // Archive mob data
+ mobTableDir = FSUtils.getTableDir(new Path(mfs.getRootDir(), MobConstants.MOB_DIR_NAME),
+ tableName);
+ Path regionDir =
+ new Path(mobTableDir, MobUtils.getMobRegionInfo(tableName).getEncodedName());
+ if (fs.exists(regionDir)) {
+ HFileArchiver.archiveRegion(fs, mfs.getRootDir(), mobTableDir, regionDir);
+ }
}
// Delete table directory from FS (temp directory)
@@ -359,7 +366,7 @@ public class DeleteTableProcedure
}
// Delete the table directory where the mob files are saved
- if (mobTableDir != null && fs.exists(mobTableDir)) {
+ if (hasMob && mobTableDir != null && fs.exists(mobTableDir)) {
if (!fs.delete(mobTableDir, true)) {
throw new IOException("Couldn't delete mob dir " + mobTableDir);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/35a7b56e/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 676a3f4..0aad5fa 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
@@ -195,15 +195,32 @@ public class TestCreateTableProcedure {
@Test(timeout=90000)
public void testRollbackAndDoubleExecution() throws Exception {
final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
- testRollbackAndDoubleExecution(MasterProcedureTestingUtility.createHTD(tableName, "f1", "f2"));
- }
- @Test(timeout=90000)
- public void testRollbackAndDoubleExecutionOnMobTable() throws Exception {
- final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecutionOnMobTable");
+ // create the table
+ final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
+ ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
+
+ // Start the Create procedure && kill the executor
+ final byte[][] splitKeys = new byte[][] {
+ Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
+ };
HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName, "f1", "f2");
- htd.getFamily(Bytes.toBytes("f1")).setMobEnabled(true);
- testRollbackAndDoubleExecution(htd);
+ htd.setRegionReplication(3);
+ HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, splitKeys);
+ long procId = procExec.submitProcedure(
+ new CreateTableProcedure(procExec.getEnvironment(), htd, regions), nonceGroup, nonce);
+
+ // NOTE: the 4 (number of CreateTableState steps) is hardcoded,
+ // so you have to look at this test at least once when you add a new step.
+ MasterProcedureTestingUtility.testRollbackAndDoubleExecution(
+ procExec, procId, 4, CreateTableState.values());
+
+ MasterProcedureTestingUtility.validateTableDeletion(
+ UTIL.getHBaseCluster().getMaster(), tableName, regions, "f1", "f2");
+
+ // are we able to create the table after a rollback?
+ resetProcExecutorTestingKillFlag();
+ testSimpleCreate(tableName, splitKeys);
}
@Test(timeout=90000)
@@ -265,31 +282,4 @@ public class TestCreateTableProcedure {
}
}
}
-
- private void testRollbackAndDoubleExecution(HTableDescriptor htd) throws Exception {
- // create the table
- final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
- ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
-
- // Start the Create procedure && kill the executor
- final byte[][] splitKeys = new byte[][] {
- Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
- };
- htd.setRegionReplication(3);
- HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, splitKeys);
- long procId = procExec.submitProcedure(
- new CreateTableProcedure(procExec.getEnvironment(), htd, regions), nonceGroup, nonce);
-
- // NOTE: the 4 (number of CreateTableState steps) is hardcoded,
- // so you have to look at this test at least once when you add a new step.
- MasterProcedureTestingUtility.testRollbackAndDoubleExecution(
- procExec, procId, 4, CreateTableState.values());
- TableName tableName = htd.getTableName();
- MasterProcedureTestingUtility.validateTableDeletion(
- UTIL.getHBaseCluster().getMaster(), tableName, regions, "f1", "f2");
-
- // are we able to create the table after a rollback?
- resetProcExecutorTestingKillFlag();
- testSimpleCreate(tableName, splitKeys);
- }
}
[3/4] hbase git commit: Revert "Revert "HBASE-14909 NPE testing for
RIT"" Reverted the wrong patch... putting it back (revert of a revert)
Posted by st...@apache.org.
Revert "Revert "HBASE-14909 NPE testing for RIT""
Reverted the wrong patch... putting it back (revert of a revert)
This reverts commit 157a60f1b396ab9adc7f934a15352f2dbc5493a9.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a4a44587
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a4a44587
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a4a44587
Branch: refs/heads/master
Commit: a4a44587b3f2236750569f5c032b283dc77942f6
Parents: 157a60f
Author: stack <st...@apache.org>
Authored: Fri Dec 4 16:38:33 2015 -0800
Committer: stack <st...@apache.org>
Committed: Fri Dec 4 16:38:33 2015 -0800
----------------------------------------------------------------------
.../hadoop/hbase/HBaseTestingUtility.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a4a44587/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 5bb25db..006c3e7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -17,7 +17,10 @@
*/
package org.apache.hadoop.hbase;
-import javax.annotation.Nullable;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -44,6 +47,8 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import javax.annotation.Nullable;
+
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,7 +63,6 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.BufferedMutator;
-import org.apache.hadoop.hbase.client.ClusterConnection;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Consistency;
@@ -84,6 +88,7 @@ import org.apache.hadoop.hbase.io.hfile.HFile;
import org.apache.hadoop.hbase.ipc.RpcServerInterface;
import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
import org.apache.hadoop.hbase.mapreduce.MapreduceTestingShim;
+import org.apache.hadoop.hbase.master.AssignmentManager;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.RegionStates;
import org.apache.hadoop.hbase.master.ServerManager;
@@ -129,10 +134,6 @@ import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooKeeper.States;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
/**
* Facility for testing HBase. Replacement for
* old HBaseTestCase and HBaseClusterTestCase functionality.
@@ -3767,8 +3768,11 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
@Override
public boolean evaluate() throws IOException {
- final RegionStates regionStates = getMiniHBaseCluster().getMaster()
- .getAssignmentManager().getRegionStates();
+ HMaster master = getMiniHBaseCluster().getMaster();
+ if (master == null) return false;
+ AssignmentManager am = master.getAssignmentManager();
+ if (am == null) return false;
+ final RegionStates regionStates = am.getRegionStates();
return !regionStates.isRegionsInTransition();
}
};
[2/4] hbase git commit: Revert "HBASE-14909 NPE testing for RIT"
Posted by st...@apache.org.
Revert "HBASE-14909 NPE testing for RIT"
This reverts commit da0cc598feab995eed12527d90805dd627674035.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/157a60f1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/157a60f1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/157a60f1
Branch: refs/heads/master
Commit: 157a60f1b396ab9adc7f934a15352f2dbc5493a9
Parents: 35a7b56
Author: stack <st...@apache.org>
Authored: Fri Dec 4 16:37:14 2015 -0800
Committer: stack <st...@apache.org>
Committed: Fri Dec 4 16:37:14 2015 -0800
----------------------------------------------------------------------
.../hadoop/hbase/HBaseTestingUtility.java | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/157a60f1/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 006c3e7..5bb25db 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -17,10 +17,7 @@
*/
package org.apache.hadoop.hbase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -47,8 +44,6 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nullable;
-
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -63,6 +58,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.BufferedMutator;
+import org.apache.hadoop.hbase.client.ClusterConnection;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Consistency;
@@ -88,7 +84,6 @@ import org.apache.hadoop.hbase.io.hfile.HFile;
import org.apache.hadoop.hbase.ipc.RpcServerInterface;
import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
import org.apache.hadoop.hbase.mapreduce.MapreduceTestingShim;
-import org.apache.hadoop.hbase.master.AssignmentManager;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.RegionStates;
import org.apache.hadoop.hbase.master.ServerManager;
@@ -134,6 +129,10 @@ import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooKeeper.States;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Facility for testing HBase. Replacement for
* old HBaseTestCase and HBaseClusterTestCase functionality.
@@ -3768,11 +3767,8 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
@Override
public boolean evaluate() throws IOException {
- HMaster master = getMiniHBaseCluster().getMaster();
- if (master == null) return false;
- AssignmentManager am = master.getAssignmentManager();
- if (am == null) return false;
- final RegionStates regionStates = am.getRegionStates();
+ final RegionStates regionStates = getMiniHBaseCluster().getMaster()
+ .getAssignmentManager().getRegionStates();
return !regionStates.isRegionsInTransition();
}
};
[4/4] hbase git commit: HBASE-14907 NPE of MobUtils.hasMobColumns in Build failed in Jenkins: HBase-Trunk_matrix » latest1.8,Hadoop #513 (Jingcheng Du) Put back HBASE-14907 but with right JIRA number (by doing a revert of a revert)
Posted by st...@apache.org.
HBASE-14907 NPE of MobUtils.hasMobColumns in Build failed in Jenkins: HBase-Trunk_matrix » latest1.8,Hadoop #513 (Jingcheng Du)
Put back HBASE-14907 but with right JIRA number (by doing a revert of a revert)
This reverts commit 35a7b56e530f3e4a12f1968df5aee9d3b63815bb.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c6b8e6f1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c6b8e6f1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c6b8e6f1
Branch: refs/heads/master
Commit: c6b8e6f1ac4aebb996d793b1cae0a95dd343db92
Parents: a4a4458
Author: stack <st...@apache.org>
Authored: Fri Dec 4 16:40:27 2015 -0800
Committer: stack <st...@apache.org>
Committed: Fri Dec 4 16:40:27 2015 -0800
----------------------------------------------------------------------
.../master/procedure/DeleteTableProcedure.java | 23 +++-----
.../procedure/TestCreateTableProcedure.java | 58 ++++++++++++--------
2 files changed, 42 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c6b8e6f1/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
index 4b95fa8..1e86254 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotDisabledException;
@@ -345,19 +344,13 @@ public class DeleteTableProcedure
LOG.debug("Table '" + tableName + "' archived!");
}
- // Archive the mob data if there is a mob-enabled column
- HTableDescriptor htd = env.getMasterServices().getTableDescriptors().get(tableName);
- boolean hasMob = MobUtils.hasMobColumns(htd);
- Path mobTableDir = null;
- if (hasMob) {
- // Archive mob data
- mobTableDir = FSUtils.getTableDir(new Path(mfs.getRootDir(), MobConstants.MOB_DIR_NAME),
- tableName);
- Path regionDir =
- new Path(mobTableDir, MobUtils.getMobRegionInfo(tableName).getEncodedName());
- if (fs.exists(regionDir)) {
- HFileArchiver.archiveRegion(fs, mfs.getRootDir(), mobTableDir, regionDir);
- }
+ // Archive mob data
+ Path mobTableDir = FSUtils.getTableDir(new Path(mfs.getRootDir(), MobConstants.MOB_DIR_NAME),
+ tableName);
+ Path regionDir =
+ new Path(mobTableDir, MobUtils.getMobRegionInfo(tableName).getEncodedName());
+ if (fs.exists(regionDir)) {
+ HFileArchiver.archiveRegion(fs, mfs.getRootDir(), mobTableDir, regionDir);
}
// Delete table directory from FS (temp directory)
@@ -366,7 +359,7 @@ public class DeleteTableProcedure
}
// Delete the table directory where the mob files are saved
- if (hasMob && mobTableDir != null && fs.exists(mobTableDir)) {
+ if (mobTableDir != null && fs.exists(mobTableDir)) {
if (!fs.delete(mobTableDir, true)) {
throw new IOException("Couldn't delete mob dir " + mobTableDir);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/c6b8e6f1/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 0aad5fa..676a3f4 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
@@ -195,32 +195,15 @@ public class TestCreateTableProcedure {
@Test(timeout=90000)
public void testRollbackAndDoubleExecution() throws Exception {
final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");
+ testRollbackAndDoubleExecution(MasterProcedureTestingUtility.createHTD(tableName, "f1", "f2"));
+ }
- // create the table
- final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
- ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
-
- // Start the Create procedure && kill the executor
- final byte[][] splitKeys = new byte[][] {
- Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
- };
+ @Test(timeout=90000)
+ public void testRollbackAndDoubleExecutionOnMobTable() throws Exception {
+ final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecutionOnMobTable");
HTableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName, "f1", "f2");
- htd.setRegionReplication(3);
- HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, splitKeys);
- long procId = procExec.submitProcedure(
- new CreateTableProcedure(procExec.getEnvironment(), htd, regions), nonceGroup, nonce);
-
- // NOTE: the 4 (number of CreateTableState steps) is hardcoded,
- // so you have to look at this test at least once when you add a new step.
- MasterProcedureTestingUtility.testRollbackAndDoubleExecution(
- procExec, procId, 4, CreateTableState.values());
-
- MasterProcedureTestingUtility.validateTableDeletion(
- UTIL.getHBaseCluster().getMaster(), tableName, regions, "f1", "f2");
-
- // are we able to create the table after a rollback?
- resetProcExecutorTestingKillFlag();
- testSimpleCreate(tableName, splitKeys);
+ htd.getFamily(Bytes.toBytes("f1")).setMobEnabled(true);
+ testRollbackAndDoubleExecution(htd);
}
@Test(timeout=90000)
@@ -282,4 +265,31 @@ public class TestCreateTableProcedure {
}
}
}
+
+ private void testRollbackAndDoubleExecution(HTableDescriptor htd) throws Exception {
+ // create the table
+ final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
+ ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
+
+ // Start the Create procedure && kill the executor
+ final byte[][] splitKeys = new byte[][] {
+ Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
+ };
+ htd.setRegionReplication(3);
+ HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, splitKeys);
+ long procId = procExec.submitProcedure(
+ new CreateTableProcedure(procExec.getEnvironment(), htd, regions), nonceGroup, nonce);
+
+ // NOTE: the 4 (number of CreateTableState steps) is hardcoded,
+ // so you have to look at this test at least once when you add a new step.
+ MasterProcedureTestingUtility.testRollbackAndDoubleExecution(
+ procExec, procId, 4, CreateTableState.values());
+ TableName tableName = htd.getTableName();
+ MasterProcedureTestingUtility.validateTableDeletion(
+ UTIL.getHBaseCluster().getMaster(), tableName, regions, "f1", "f2");
+
+ // are we able to create the table after a rollback?
+ resetProcExecutorTestingKillFlag();
+ testSimpleCreate(tableName, splitKeys);
+ }
}