From 93a924a3488cc82f43936f9ee32d496cf3107079 Mon Sep 17 00:00:00 2001 From: Pankaj Kumar Date: Wed, 4 Oct 2017 18:29:46 +0800 Subject: [PATCH] HBASE-18923, TestTableResource flaky on branch-1 --- .../src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a7de2f1..b6c9451 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 @@ -127,7 +127,8 @@ public class TestTableResource { // give some time for the split to happen long timeout = System.currentTimeMillis() + (15 * 1000); - while (System.currentTimeMillis() < timeout && m.size()!=2){ + while (System.currentTimeMillis() < timeout && (m.size() != 2 + || (m.get(0).getServerName() == null || m.get(1).getServerName() == null))) { try { Thread.sleep(250); } catch (InterruptedException e) { -- 2.7.2.windows.1