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

HBASE-21949 Fix flaky test TestHBaseTestingUtility.testMiniZooKeeperWithMultipleClientPorts 

Signed-off-by: Guanghao Zhang <zghao@apache.org>
This commit is contained in:
maoling 2019-03-05 17:09:54 +08:00 committed by Guanghao Zhang
parent 4a78deb616
commit 70558174f0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
View File

@ -275,7 +275,9 @@ public class TestHBaseTestingUtility {
List<Integer> clientPortListInCluster = cluster1.getClientPortList(); List<Integer> clientPortListInCluster = cluster1.getClientPortList();
for (i = 0; i < clientPortListInCluster.size(); i++) { for (i = 0; i < clientPortListInCluster.size(); i++) {
assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList1[i]); // cannot assert the specific port due to the port conflict in which situation
// it always chooses a bigger port by +1. The below is the same.
assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList1[i]);
} }
} finally { } finally {
hbt.shutdownMiniZKCluster(); hbt.shutdownMiniZKCluster();
@ -292,11 +294,11 @@ public class TestHBaseTestingUtility {
for (i = 0, j = 0; i < clientPortListInCluster.size(); i++) { for (i = 0, j = 0; i < clientPortListInCluster.size(); i++) {
if (i < clientPortList2.length) { if (i < clientPortList2.length) {
assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList2[i]); assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList2[i]);
} else { } else {
// servers with no specified client port will use defaultClientPort or some other ports // servers with no specified client port will use defaultClientPort or some other ports
// based on defaultClientPort // based on defaultClientPort
assertEquals(clientPortListInCluster.get(i).intValue(), defaultClientPort + j); assertTrue(clientPortListInCluster.get(i).intValue() >= defaultClientPort + j);
j++; j++;
} }
} }
@ -317,9 +319,9 @@ public class TestHBaseTestingUtility {
// Servers will only use valid client ports; if ports are not specified or invalid, // Servers will only use valid client ports; if ports are not specified or invalid,
// the default port or a port based on default port will be used. // the default port or a port based on default port will be used.
if (i < clientPortList3.length && clientPortList3[i] > 0) { if (i < clientPortList3.length && clientPortList3[i] > 0) {
assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList3[i]); assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList3[i]);
} else { } else {
assertEquals(clientPortListInCluster.get(i).intValue(), defaultClientPort + j); assertTrue(clientPortListInCluster.get(i).intValue() >= defaultClientPort + j);
j++; j++;
} }
} }
@ -343,9 +345,9 @@ public class TestHBaseTestingUtility {
// Servers will only use valid client ports; if ports are not specified or invalid, // Servers will only use valid client ports; if ports are not specified or invalid,
// the default port or a port based on default port will be used. // the default port or a port based on default port will be used.
if (i < clientPortList4.length && clientPortList4[i] > 0) { if (i < clientPortList4.length && clientPortList4[i] > 0) {
assertEquals(clientPortListInCluster.get(i).intValue(), clientPortList4[i]); assertTrue(clientPortListInCluster.get(i).intValue() >= clientPortList4[i]);
} else { } else {
assertEquals(clientPortListInCluster.get(i).intValue(), defaultClientPort + j); assertTrue(clientPortListInCluster.get(i).intValue() >= defaultClientPort + j);
j +=2; j +=2;
} }
} }