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/11/18 18:08:44 UTC
hbase git commit: HBASE-17080 rest.TestTableResource fails in master
branch (ChiaPing Tsai)
Repository: hbase
Updated Branches:
refs/heads/master 046d1a56b -> 72438c022
HBASE-17080 rest.TestTableResource fails in master branch (ChiaPing Tsai)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72438c02
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72438c02
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72438c02
Branch: refs/heads/master
Commit: 72438c02237bcaca10939469dc160f0820b5d2aa
Parents: 046d1a5
Author: tedyu <yu...@gmail.com>
Authored: Fri Nov 18 10:08:37 2016 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Fri Nov 18 10:08:37 2016 -0800
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hbase/rest/TestTableResource.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/72438c02/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
index 8fe5c98..1666bc9 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
@@ -48,6 +48,7 @@ import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.regionserver.TestEndToEndSplitTransaction;
import org.apache.hadoop.hbase.rest.client.Client;
import org.apache.hadoop.hbase.rest.client.Cluster;
import org.apache.hadoop.hbase.rest.client.Response;
@@ -127,6 +128,8 @@ public class TestTableResource {
admin.split(TABLE);
// give some time for the split to happen
+ TestEndToEndSplitTransaction.blockUntilRegionSplit(TEST_UTIL.getConfiguration(), 60000,
+ m.get(0).getRegionInfo().getRegionName(), true);
long timeout = System.currentTimeMillis() + (15 * 1000);
while (System.currentTimeMillis() < timeout && m.size()!=2){
try {