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

Improved code in case of connection failures: close the connection, 

and cancel the connect timeout task.
This commit is contained in:
Simone Bordet 2013-10-16 17:24:43 +02:00
parent 45e6ac2a5d
commit 879c3eb6f5
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
View File

@ -748,14 +748,30 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
}
catch (ClosedSelectorException | ClosedChannelException x)
{
LOG.debug(x);
failed(x);
}
}
protected void failed(Throwable failure)
{
if (failed.compareAndSet(false, true))
{
timeout.cancel();
close();
connectionFailed(channel, failure, attachment);
}
}
private void close()
{
try
{
channel.close();
}
catch (IOException x)
{
LOG.ignore(x);
}
}
}
@ -775,19 +791,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
if (channel.isConnectionPending())
{
LOG.debug("Channel {} timed out while connecting, closing it", channel);
try
{
// This will unregister the channel from the selector
channel.close();
}
catch (IOException x)
{
LOG.ignore(x);
}
finally
{
connect.failed(new SocketTimeoutException());
}
connect.failed(new SocketTimeoutException());
}
}
}

24
jetty-io/src/test/java/org/eclipse/jetty/io/SelectorManagerTest.java
View File

@ -26,6 +26,7 @@ import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.jetty.toolchain.test.annotation.Slow;
import org.eclipse.jetty.util.Callback;
@ -67,6 +68,7 @@ public class SelectorManagerTest
client.configureBlocking(false);
client.connect(address);
final AtomicBoolean timeoutConnection = new AtomicBoolean();
final long connectTimeout = 1000;
SelectorManager selectorManager = new SelectorManager(executor, scheduler)
{
@ -81,7 +83,8 @@ public class SelectorManagerTest
{
try
{
TimeUnit.MILLISECONDS.sleep(connectTimeout * 2);
if (timeoutConnection.get())
TimeUnit.MILLISECONDS.sleep(connectTimeout * 2);
return super.finishConnect(channel);
}
catch (InterruptedException e)
@ -113,17 +116,30 @@ public class SelectorManagerTest
try
{
final CountDownLatch latch = new CountDownLatch(1);
timeoutConnection.set(true);
final CountDownLatch latch1 = new CountDownLatch(1);
selectorManager.connect(client, new Callback.Adapter()
{
@Override
public void failed(Throwable x)
{
latch.countDown();
latch1.countDown();
}
});
Assert.assertTrue(latch1.await(connectTimeout * 3, TimeUnit.MILLISECONDS));
Assert.assertTrue(latch.await(connectTimeout * 3, TimeUnit.MILLISECONDS));
// Verify that after the failure we can connect successfully
timeoutConnection.set(false);
final CountDownLatch latch2 = new CountDownLatch(1);
selectorManager.connect(client, new Callback.Adapter()
{
@Override
public void failed(Throwable x)
{
latch2.countDown();
}
});
Assert.assertTrue(latch2.await(connectTimeout, TimeUnit.MILLISECONDS));
}
finally
{