Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1920 - Connect Timeouts with NonBlocking CreateEndPoint. 

Only for the client having a non-blocking CreateEndPoint was a problem,
because it was sending requests from onOpen().
For a busy client with always queued requests, CreateEndPoint.run()
did never return, causing the NIO selection to stall.
This commit is contained in:
Simone Bordet 2017-10-25 09:21:22 +02:00
parent 7bc6ec6b32
commit ce39d50a55
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
View File

@ -37,7 +37,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.component.Dumpable;
@ -160,7 +159,7 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
if (connect.timeout.cancel())
{
key.interestOps(0);
return new CreateEndPoint(channel, key)
return new CreateEndPoint(channel, key, InvocationType.BLOCKING)
{
@Override
protected void failed(Throwable failure)
@ -473,33 +472,16 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
if (selector != null && selector.isOpen())
{
Set<SelectionKey> keys = selector.keys();
AtomicInteger cancelled = new AtomicInteger();
AtomicInteger excepted = new AtomicInteger();
_dumps.add(new Object()
{
@Override
public String toString()
{
return String.format("%s keys=%d cancelled=%d excepted=%d",selector,keys.size(),cancelled.get(),excepted.get());
}
});
_dumps.add(selector + " keys=" + keys.size());
for (SelectionKey key : keys)
{
try
{
_dumps.add(String.format("SelectionKey@%x{i=%d}->%s", key.hashCode(), key.interestOps(), key.attachment()));
}
catch (CancelledKeyException cke)
{
LOG.ignore(cke);
cancelled.incrementAndGet();
}
catch (Throwable x)
{
LOG.ignore(x);
excepted.incrementAndGet();
}
}
}
@ -612,7 +594,7 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
try
{
final SelectionKey key = channel.register(_selector, 0, attachment);
submit(new CreateEndPoint(channel, key));
submit(new CreateEndPoint(channel, key, InvocationType.NON_BLOCKING));
}
catch (Throwable x)
{
@ -622,15 +604,17 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
}
}
private class CreateEndPoint implements Runnable, Closeable
private class CreateEndPoint implements Runnable, Invocable, Closeable
{
private final SelectableChannel channel;
private final SelectionKey key;
private final InvocationType invocationType;
public CreateEndPoint(SelectableChannel channel, SelectionKey key)
public CreateEndPoint(SelectableChannel channel, SelectionKey key, InvocationType invocationType)
{
this.channel = channel;
this.key = key;
this.invocationType = invocationType;
}
@Override
@ -647,6 +631,12 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
}
}
@Override
public InvocationType getInvocationType()
{
return invocationType;
}
@Override
public void close()
{
@ -813,7 +803,7 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
}
}
private class DestroyEndPoint extends NonBlockingAction
private class DestroyEndPoint extends NonBlockingAction implements Closeable
{
private final EndPoint endPoint;
@ -832,5 +822,11 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
_selectorManager.connectionClosed(connection);
_selectorManager.endPointClosed(endPoint);
}
@Override
public void close()
{
run();
}
}
}