Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-21093 Increase the dispatch delay for testing DDL procedures"

Browse Source 
This reverts commit c01d4d3a35a53d67d4106fc906629413f8e980a7.
This commit is contained in:
zhangduo 2018-08-22 21:48:03 +08:00
parent 74ea011169
commit 064388b478
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
View File

@ -15,17 +15,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.hadoop.hbase.master.procedure;
import static org.junit.Assert.assertTrue; package org.apache.hadoop.hbase.master.procedure;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
@ -33,14 +31,14 @@ import org.junit.BeforeClass;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertTrue;
public abstract class TestTableDDLProcedureBase { public abstract class TestTableDDLProcedureBase {
private static final Logger LOG = LoggerFactory.getLogger(TestTableDDLProcedureBase.class); private static final Logger LOG = LoggerFactory.getLogger(TestTableDDLProcedureBase.class);
protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
private static void setupConf(Configuration conf) { private static void setupConf(Configuration conf) {
conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1); conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);
// increase the dispatch delay so we can do more batching
conf.setInt(RemoteProcedureDispatcher.DISPATCH_DELAY_CONF_KEY, 2000);
} }
@BeforeClass @BeforeClass
@ -66,7 +64,7 @@ public abstract class TestTableDDLProcedureBase {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
resetProcExecutorTestingKillFlag(); resetProcExecutorTestingKillFlag();
for (TableDescriptor htd : UTIL.getAdmin().listTableDescriptors()) { for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
LOG.info("Tear down, remove table=" + htd.getTableName()); LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName()); UTIL.deleteTable(htd.getTableName());
} }