You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/06/14 22:55:03 UTC
svn commit: r1493240 - in /qpid/trunk/qpid/java:
broker/src/main/java/org/apache/qpid/server/logging/messages/
broker/src/main/java/org/apache/qpid/server/protocol/
broker/src/main/java/org/apache/qpid/server/transport/
common/src/main/java/org/apache/...
Author: rgodfrey
Date: Fri Jun 14 20:55:03 2013
New Revision: 1493240
URL: http://svn.apache.org/r1493240
Log:
QPID-4925 : [Java Broker] Timeout connections which do not complete connection handshake
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties?rev=1493240&r1=1493239&r2=1493240&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties Fri Jun 14 20:55:03 2013
@@ -22,4 +22,5 @@
# 1 - Protocol Version
# 2 - Client Version
OPEN = CON-1001 : Open[ : Client ID : {0}][ : Protocol Version : {1}][ : Client Version : {2}]
-CLOSE = CON-1002 : Close
\ No newline at end of file
+CLOSE = CON-1002 : Close
+IDLE_CLOSE = CON-1003 : Closed due to inactivity
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1493240&r1=1493239&r2=1493240&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java Fri Jun 14 20:55:03 2013
@@ -790,6 +790,11 @@ public class AMQProtocolEngine implement
_network.setMaxWriteIdle(delay);
_network.setMaxReadIdle(BrokerProperties.HEARTBEAT_TIMEOUT_FACTOR * delay);
}
+ else
+ {
+ _network.setMaxWriteIdle(0);
+ _network.setMaxReadIdle(0);
+ }
}
/**
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java?rev=1493240&r1=1493239&r2=1493240&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java Fri Jun 14 20:55:03 2013
@@ -32,6 +32,8 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLPeerUnverifiedException;
import org.apache.log4j.Logger;
import org.apache.qpid.protocol.ServerProtocolEngine;
+import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.logging.messages.ConnectionMessages;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
@@ -452,6 +454,7 @@ public class MultiVersionProtocolEngine
private class SelfDelegateProtocolEngine implements ServerProtocolEngine
{
private final ByteBuffer _header = ByteBuffer.allocate(MINIMUM_REQUIRED_HEADER_BYTES);
+ private long _lastReadTime;
public SocketAddress getRemoteAddress()
{
@@ -475,6 +478,8 @@ public class MultiVersionProtocolEngine
public void received(ByteBuffer msg)
{
+
+ _lastReadTime = System.currentTimeMillis();
ByteBuffer msgheader = msg.duplicate();
if(_header.remaining() > msgheader.limit())
{
@@ -623,7 +628,8 @@ public class MultiVersionProtocolEngine
public void readerIdle()
{
-
+ CurrentActor.get().message(ConnectionMessages.IDLE_CLOSE());
+ _network.close();
}
public void setNetworkConnection(NetworkConnection network, Sender<ByteBuffer> sender)
@@ -634,7 +640,7 @@ public class MultiVersionProtocolEngine
@Override
public long getLastReadTime()
{
- return 0;
+ return _lastReadTime;
}
@Override
@@ -650,6 +656,7 @@ public class MultiVersionProtocolEngine
private final SSLEngine _engine;
private final SSLReceiver _sslReceiver;
private final SSLBufferingSender _sslSender;
+ private long _lastReadTime;
private SslDelegateProtocolEngine()
{
@@ -678,6 +685,7 @@ public class MultiVersionProtocolEngine
@Override
public void received(ByteBuffer msg)
{
+ _lastReadTime = System.currentTimeMillis();
_sslReceiver.received(msg);
_sslSender.send();
_sslSender.flush();
@@ -746,7 +754,7 @@ public class MultiVersionProtocolEngine
@Override
public long getLastReadTime()
{
- return _decryptEngine.getLastReadTime();
+ return _lastReadTime;
}
@Override
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java?rev=1493240&r1=1493239&r2=1493240&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java Fri Jun 14 20:55:03 2013
@@ -236,15 +236,24 @@ public class ServerConnectionDelegate ex
return;
}
+ final NetworkConnection networkConnection = sconn.getNetworkConnection();
+
if(ok.hasHeartbeat())
{
- final int heartbeat = ok.getHeartbeat();
- if(heartbeat > 0)
+ int heartbeat = ok.getHeartbeat();
+ if(heartbeat < 0)
{
- final NetworkConnection networkConnection = sconn.getNetworkConnection();
- networkConnection.setMaxReadIdle(2 * heartbeat);
- networkConnection.setMaxWriteIdle(heartbeat);
+ heartbeat = 0;
}
+
+ networkConnection.setMaxReadIdle(2 * heartbeat);
+ networkConnection.setMaxWriteIdle(heartbeat);
+
+ }
+ else
+ {
+ networkConnection.setMaxReadIdle(0);
+ networkConnection.setMaxWriteIdle(0);
}
setConnectionTuneOkChannelMax(sconn, okChannelMax);
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java?rev=1493240&r1=1493239&r2=1493240&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java Fri Jun 14 20:55:03 2013
@@ -33,6 +33,9 @@ public class CommonProperties
public static final String IO_NETWORK_TRANSPORT_TIMEOUT_PROP_NAME = "qpid.io_network_transport_timeout";
public static final int IO_NETWORK_TRANSPORT_TIMEOUT_DEFAULT = 60000;
+ public static final String HANDSHAKE_TIMEOUT_PROP_NAME = "qpid.handshake_timeout";
+ public static final int HANDSHAKE_TIMEOUT_DEFAULT = 2;
+
private CommonProperties()
{
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java?rev=1493240&r1=1493239&r2=1493240&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java Fri Jun 14 20:55:03 2013
@@ -50,6 +50,9 @@ public class IoNetworkTransport implemen
private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(IoNetworkTransport.class);
private static final int TIMEOUT = Integer.getInteger(CommonProperties.IO_NETWORK_TRANSPORT_TIMEOUT_PROP_NAME,
CommonProperties.IO_NETWORK_TRANSPORT_TIMEOUT_DEFAULT);
+ private static final int HANSHAKE_TIMEOUT = Integer.getInteger(CommonProperties.HANDSHAKE_TIMEOUT_PROP_NAME ,
+ CommonProperties.HANDSHAKE_TIMEOUT_DEFAULT);
+
private Socket _socket;
private IoNetworkConnection _connection;
@@ -224,7 +227,7 @@ public class IoNetworkTransport implemen
{
socket = _serverSocket.accept();
socket.setTcpNoDelay(_config.getTcpNoDelay());
- socket.setSoTimeout(_timeout);
+ socket.setSoTimeout(1000 * HANSHAKE_TIMEOUT);
final Integer sendBufferSize = _config.getSendBufferSize();
final Integer receiveBufferSize = _config.getReceiveBufferSize();
@@ -237,6 +240,9 @@ public class IoNetworkTransport implemen
final IdleTimeoutTicker ticker = new IdleTimeoutTicker(engine, TIMEOUT);
NetworkConnection connection = new IoNetworkConnection(socket, engine, sendBufferSize, receiveBufferSize, _timeout,
ticker);
+
+ connection.setMaxReadIdle(HANSHAKE_TIMEOUT);
+
ticker.setConnection(connection);
if(_sslContext != null && socket instanceof SSLSocket)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org