honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TESTS: Explicitly Fail Http Client Timeouts (#32708) 

* Don't quietly ignore timeouts when waiting for HTTP responses
* Fixes #32702
This commit is contained in:
Armin Braun 2018-08-08 15:47:51 +02:00 committed by GitHub
parent 781e6ad551
commit 7d641ba69b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpClient.java
View File

@ -58,6 +58,7 @@ import java.util.concurrent.TimeUnit;
import static io.netty.handler.codec.http.HttpHeaderNames.HOST;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
import static org.junit.Assert.fail;
/**
* Tiny helper to send http requests over netty.
@ -145,7 +146,9 @@ class Netty4HttpClient implements Closeable {
for (HttpRequest request : requests) {
channelFuture.channel().writeAndFlush(request);
}
latch.await(30, TimeUnit.SECONDS);
if (latch.await(30L, TimeUnit.SECONDS) == false) {
fail("Failed to get all expected responses.");
}
} finally {
if (channelFuture != null) {

5
plugins/transport-nio/src/test/java/org/elasticsearch/http/nio/NioHttpClient.java
View File

@ -71,6 +71,7 @@ import java.util.function.Consumer;
import static io.netty.handler.codec.http.HttpHeaderNames.HOST;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
import static org.elasticsearch.common.util.concurrent.EsExecutors.daemonThreadFactory;
import static org.junit.Assert.fail;
/**
* Tiny helper to send http requests over nio.
@ -136,7 +137,9 @@ class NioHttpClient implements Closeable {
for (HttpRequest request : requests) {
nioSocketChannel.getContext().sendMessage(request, (v, e) -> {});
}
latch.await(30, TimeUnit.SECONDS);
if (latch.await(30L, TimeUnit.SECONDS) == false) {
fail("Failed to get all expected responses.");
}
} catch (IOException e) {
throw new UncheckedIOException(e);