You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/08/22 06:26:59 UTC
hbase git commit: HBASE-21093 Increase the dispatch delay for testing
DDL procedures
Repository: hbase
Updated Branches:
refs/heads/master 50055dbf0 -> c01d4d3a3
HBASE-21093 Increase the dispatch delay for testing DDL procedures
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c01d4d3a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c01d4d3a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c01d4d3a
Branch: refs/heads/master
Commit: c01d4d3a35a53d67d4106fc906629413f8e980a7
Parents: 50055db
Author: Duo Zhang <zh...@apache.org>
Authored: Wed Aug 22 10:43:25 2018 +0800
Committer: Duo Zhang <zh...@apache.org>
Committed: Wed Aug 22 14:26:35 2018 +0800
----------------------------------------------------------------------
.../master/procedure/TestTableDDLProcedureBase.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c01d4d3a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
index f7cf640..c1f867d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
@@ -15,15 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.hadoop.hbase.master.procedure;
+import static org.junit.Assert.assertTrue;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
+import org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -31,14 +33,14 @@ import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertTrue;
-
public abstract class TestTableDDLProcedureBase {
private static final Logger LOG = LoggerFactory.getLogger(TestTableDDLProcedureBase.class);
protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
private static void setupConf(Configuration conf) {
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
@@ -64,7 +66,7 @@ public abstract class TestTableDDLProcedureBase {
@After
public void tearDown() throws Exception {
resetProcExecutorTestingKillFlag();
- for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
+ for (TableDescriptor htd : UTIL.getAdmin().listTableDescriptors()) {
LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName());
}