You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/10/12 19:08:44 UTC
svn commit: r1708165 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/transport/
broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/
client/src/main/java/org/apache/qpid/client/
Author: orudyy
Date: Mon Oct 12 17:08:44 2015
New Revision: 1708165
URL: http://svn.apache.org/viewvc?rev=1708165&view=rev
Log:
QPID-6784: [Java Broker, Java Client] Fix max frame size related issue on AMQP 0-8/0-9-x
On client adopt 0-9-1 interpretation of max frame size which includes 7 headers bytes, payload size and 1 end of frame byte.
On broker change default max frame size to fit over-sized frames from old clients into a single network buffer
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1708165&r1=1708164&r2=1708165&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java Mon Oct 12 17:08:44 2015
@@ -64,6 +64,7 @@ public class NonBlockingConnection imple
private boolean _partialRead = false;
private final AmqpPort _port;
+ private boolean _unexpectedByteBufferSizeUsed;
public NonBlockingConnection(SocketChannel socketChannel,
ProtocolEngine protocolEngine,
@@ -471,4 +472,13 @@ public class NonBlockingConnection imple
LOGGER.debug("Identified transport encryption as " + transportEncryption);
}
+ void reportUnexpectedByteBufferSizeUsage()
+ {
+ if (!_unexpectedByteBufferSizeUsed)
+ {
+ LOGGER.info("At least one frame unexpectedly does not fit into default byte buffer size ({}B) on a connection {}.",
+ _port.getNetworkBufferSize(), this.toString());
+ _unexpectedByteBufferSizeUsed = true;
+ }
+ }
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java?rev=1708165&r1=1708164&r2=1708165&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java Mon Oct 12 17:08:44 2015
@@ -78,9 +78,17 @@ public class NonBlockingConnectionPlainD
else
{
QpidByteBuffer currentBuffer = _netInputBuffer;
- int newBufSize = (currentBuffer.capacity() < _networkBufferSize)
- ? _networkBufferSize
- : currentBuffer.capacity() + _networkBufferSize;
+ int newBufSize;
+
+ if (currentBuffer.capacity() < _networkBufferSize)
+ {
+ newBufSize = _networkBufferSize;
+ }
+ else
+ {
+ newBufSize = currentBuffer.capacity() + _networkBufferSize;
+ _parent.reportUnexpectedByteBufferSizeUsage();
+ }
_netInputBuffer = QpidByteBuffer.allocateDirect(newBufSize);
_netInputBuffer.put(currentBuffer);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java?rev=1708165&r1=1708164&r2=1708165&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java Mon Oct 12 17:08:44 2015
@@ -178,9 +178,16 @@ public class NonBlockingConnectionTLSDel
else
{
QpidByteBuffer currentBuffer = _applicationBuffer;
- int newBufSize = (currentBuffer.capacity() < _networkBufferSize)
- ? _networkBufferSize
- : currentBuffer.capacity() + _networkBufferSize;
+ int newBufSize;
+ if (currentBuffer.capacity() < _networkBufferSize)
+ {
+ newBufSize = _networkBufferSize;
+ }
+ else
+ {
+ newBufSize = currentBuffer.capacity() + _networkBufferSize;
+ _parent.reportUnexpectedByteBufferSizeUsage();
+ }
_applicationBuffer = QpidByteBuffer.allocateDirect(newBufSize);
_applicationBuffer.put(currentBuffer);
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1708165&r1=1708164&r2=1708165&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java Mon Oct 12 17:08:44 2015
@@ -283,6 +283,15 @@ public class AMQPConnection_0_8
return _maxFrameSize;
}
+ private int getDefaultMaxFrameSize()
+ {
+ Broker<?> broker = getBroker();
+
+ // QPID-6784 : Some old clients send payload with size equals to max frame size
+ // we want to fit those frames into the network buffer
+ return broker.getNetworkBufferSize() - AMQFrame.getFrameOverhead();
+ }
+
public boolean isClosing()
{
return _orderlyClose.get();
@@ -317,8 +326,7 @@ public class AMQPConnection_0_8
if (_virtualHost.getState() == State.ACTIVE)
{
throw new ServerScopedRuntimeException(e);
- }
- else
+ } else
{
throw new ConnectionScopedRuntimeException(e);
}
@@ -1249,7 +1257,7 @@ public class AMQPConnection_0_8
case SUCCESS:
_logger.debug("Connected as: {} ", authResult.getSubject());
- int frameMax = broker.getNetworkBufferSize();
+ int frameMax = getDefaultMaxFrameSize();
if (frameMax <= 0)
{
@@ -1356,7 +1364,7 @@ public class AMQPConnection_0_8
_logger.debug("Connected as: {}", authResult.getSubject());
setAuthorizedSubject(authResult.getSubject());
- int frameMax = broker.getNetworkBufferSize();
+ int frameMax = getDefaultMaxFrameSize();
if (frameMax <= 0)
{
@@ -1399,7 +1407,7 @@ public class AMQPConnection_0_8
initHeartbeats(heartbeat);
- int brokerFrameMax = getBroker().getNetworkBufferSize();
+ int brokerFrameMax = getDefaultMaxFrameSize();
if (brokerFrameMax <= 0)
{
brokerFrameMax = Integer.MAX_VALUE;
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java?rev=1708165&r1=1708164&r2=1708165&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java Mon Oct 12 17:08:44 2015
@@ -396,7 +396,7 @@ public class BasicMessageProducer_0_8 ex
else
{
- final long framePayloadMax = getSession().getAMQConnection().getMaximumFrameSize() - 1;
+ final long framePayloadMax = getMaximumPayloadSize();
long remaining = payload.remaining();
for (int i = offset; i < frames.length; i++)
{
@@ -424,7 +424,7 @@ public class BasicMessageProducer_0_8 ex
else
{
int dataLength = payload.remaining();
- final long framePayloadMax = getSession().getAMQConnection().getMaximumFrameSize() - 1;
+ final long framePayloadMax = getMaximumPayloadSize();
int lastFrame = ((dataLength % framePayloadMax) > 0) ? 1 : 0;
frameCount = (int) (dataLength / framePayloadMax) + lastFrame;
}
@@ -432,6 +432,11 @@ public class BasicMessageProducer_0_8 ex
return frameCount;
}
+ private long getMaximumPayloadSize()
+ {
+ return getSession().getAMQConnection().getMaximumFrameSize() - 8;
+ }
+
@Override
public AMQSession_0_8 getSession()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org