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

Revert "Fix the flaky TestThriftHttpServer" 

This reverts commit 4f7aa3b71d.
This commit is contained in:
huzheng 2018-05-09 10:44:35 +08:00
parent 4f7aa3b71d
commit dda8018b0f
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java
View File

@ -57,6 +57,7 @@ import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
* interface and talk to it from client side. * interface and talk to it from client side.
*/ */
@Category({ClientTests.class, LargeTests.class}) @Category({ClientTests.class, LargeTests.class})
public class TestThriftHttpServer { public class TestThriftHttpServer {
@ClassRule @ClassRule
@ -117,14 +118,18 @@ public class TestThriftHttpServer {
LOG.info("Starting HBase Thrift server with HTTP server: " + Joiner.on(" ").join(args)); LOG.info("Starting HBase Thrift server with HTTP server: " + Joiner.on(" ").join(args));
httpServerException = null; httpServerException = null;
httpServerThread = new Thread(() -> { httpServerThread = new Thread(new Runnable() {
try { @Override
thriftServer.doMain(args); public void run() {
} catch (Exception e) { try {
httpServerException = e; thriftServer.doMain(args);
} catch (Exception e) {
httpServerException = e;
}
} }
}); });
httpServerThread.setName(ThriftServer.class.getSimpleName() + "-httpServer"); httpServerThread.setName(ThriftServer.class.getSimpleName() +
"-httpServer");
httpServerThread.start(); httpServerThread.start();
} }
@ -163,9 +168,13 @@ public class TestThriftHttpServer {
startHttpServerThread(args.toArray(new String[args.size()])); startHttpServerThread(args.toArray(new String[args.size()]));
// wait up to 10s for the server to start // wait up to 10s for the server to start
HBaseTestingUtility.waitForHostPort(HConstants.LOCALHOST, port); for (int i = 0; i < 100
&& (thriftServer.serverRunner == null || thriftServer.serverRunner.httpServer ==
null); i++) {
Thread.sleep(100);
}
String url = "http://" + HConstants.LOCALHOST + ":" + port; String url = "http://"+ HConstants.LOCALHOST + ":" + port;
try { try {
checkHttpMethods(url); checkHttpMethods(url);
talkToThriftServer(url, customHeaderSize); talkToThriftServer(url, customHeaderSize);
@ -177,7 +186,7 @@ public class TestThriftHttpServer {
if (clientSideException != null) { if (clientSideException != null) {
LOG.error("Thrift client threw an exception " + clientSideException); LOG.error("Thrift client threw an exception " + clientSideException);
if (clientSideException instanceof TTransportException) { if (clientSideException instanceof TTransportException) {
throw clientSideException; throw clientSideException;
} else { } else {
throw new Exception(clientSideException); throw new Exception(clientSideException);