Skip to content

UNDERTOW-1859 Fix WriteTimeoutTestCase not terminating #1474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TomasHofman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

UNDERTOW-1859 Fix WriteTimeoutTestCase not terminating #1474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions core/src/test/java/io/undertow/server/WriteTimeoutTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.channels.Channel;
import java.nio.channels.ClosedChannelException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

Expand All @@ -31,7 +32,6 @@
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.xnio.ChannelListener;
Expand All @@ -47,7 +47,7 @@
*/
@RunWith(DefaultServer.class)
@HttpOneOnly
@Ignore("UNDERTOW-1859 this test freezes") //FIXME
// @Ignore("UNDERTOW-1859 this test freezes") //FIXME
public class WriteTimeoutTestCase {

private volatile Exception exception;
Expand Down Expand Up @@ -92,12 +92,10 @@ public void handleEvent(final Channel channel) {
do {
try {
int res = response.write(buffer);
if (res == 0) {
return;
}
} catch (IOException e) {
exception = e;
errorLatch.countDown();
break;
}
if(!buffer.hasRemaining()) {
count++;
Expand All @@ -122,14 +120,20 @@ public void handleEvent(final Channel channel) {
while ((r = content.read(buffer)) > 0) {
Thread.sleep(200);
if (exception != null) {
Assert.assertEquals(WriteTimeoutException.class, exception.getClass());
// Depending on whether the timeout is triggered inside XNIO or in the WriteTimeoutStreamSinkConduit,
// we get either WriteTimeoutException or ClosedChannelException.
Assert.assertTrue("Unexpected exception class: " + exception.getClass(),
exception instanceof WriteTimeoutException || exception instanceof ClosedChannelException);
return;
}
}
Assert.fail("Write did not time out");
} catch (IOException e) {
if (errorLatch.await(5, TimeUnit.SECONDS)) {
Assert.assertEquals(WriteTimeoutException.class, exception.getClass());
// Depending on whether the timeout is triggered inside XNIO or in the WriteTimeoutStreamSinkConduit,
// we get either WriteTimeoutException or ClosedChannelException.
Assert.assertTrue("Unexpected exception class: " + exception.getClass(),
exception instanceof WriteTimeoutException || exception instanceof ClosedChannelException);
} else {
Assert.fail("Write did not time out");
}
Expand Down
Loading