Skip to content

Commit 946ffa3

Browse files
authored
Do not double close in AbstractHttpServerTransportTests.testForceClosesOpenChannels (#96635)
Also reduce all grace periods below 100ms Fixes: #96617
1 parent 235133d commit 946ffa3

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

server/src/test/java/org/elasticsearch/http/AbstractHttpServerTransportTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ public void dispatchBadRequest(RestChannel channel, ThreadContext threadContext,
10541054
}
10551055

10561056
public void testStopClosesChannelAfterRequest() {
1057-
try (TestHttpServerTransport transport = new TestHttpServerTransport(gracePeriod(1_000))) {
1057+
try (TestHttpServerTransport transport = new TestHttpServerTransport(gracePeriod(100))) {
10581058
transport.bindServer();
10591059

10601060
TestHttpChannel httpChannel = new TestHttpChannel();
@@ -1101,9 +1101,8 @@ public void testStopClosesChannelAfterRequest() {
11011101
}
11021102
}
11031103

1104-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/96632")
11051104
public void testForceClosesOpenChannels() {
1106-
try (TestHttpServerTransport transport = new TestHttpServerTransport(gracePeriod(1_000))) {
1105+
try (TestHttpServerTransport transport = new TestHttpServerTransport(gracePeriod(100))) {
11071106
transport.bindServer();
11081107

11091108
TestHttpChannel httpChannel = new TestHttpChannel(true);
@@ -1292,7 +1291,9 @@ public void close() {
12921291
}
12931292
if (waitForever) {
12941293
try {
1295-
closeLatch.await(1, TimeUnit.SECONDS);
1294+
if (closeLatch.await(1, TimeUnit.SECONDS) == false) {
1295+
return;
1296+
}
12961297
} catch (InterruptedException ie) {
12971298
throw new RuntimeException(ie);
12981299
}

0 commit comments

Comments
 (0)