ARTEMIS-1301 Network failures recognition on backpressure while streaming large messages
This commit is contained in:
parent
00d880eb03
commit
fdbf4f450a
|
@ -117,6 +117,7 @@ public interface CoreRemotingConnection extends RemotingConnection {
|
||||||
* @param size size we are trying to write
|
* @param size size we are trying to write
|
||||||
* @param timeout
|
* @param timeout
|
||||||
* @return
|
* @return
|
||||||
|
* @throws IllegalStateException if the connection is closed
|
||||||
*/
|
*/
|
||||||
boolean blockUntilWritable(int size, long timeout);
|
boolean blockUntilWritable(int size, long timeout);
|
||||||
}
|
}
|
||||||
|
|
|
@ -808,6 +808,7 @@ public class ActiveMQSessionContext extends SessionContext {
|
||||||
final CoreRemotingConnection connection = channel.getConnection();
|
final CoreRemotingConnection connection = channel.getConnection();
|
||||||
final long blockingCallTimeoutMillis = Math.max(0, connection.getBlockingCallTimeout());
|
final long blockingCallTimeoutMillis = Math.max(0, connection.getBlockingCallTimeout());
|
||||||
final long startFlowControl = System.nanoTime();
|
final long startFlowControl = System.nanoTime();
|
||||||
|
try {
|
||||||
final boolean isWritable = connection.blockUntilWritable(expectedEncodeSize, blockingCallTimeoutMillis);
|
final boolean isWritable = connection.blockUntilWritable(expectedEncodeSize, blockingCallTimeoutMillis);
|
||||||
if (!isWritable) {
|
if (!isWritable) {
|
||||||
final long endFlowControl = System.nanoTime();
|
final long endFlowControl = System.nanoTime();
|
||||||
|
@ -823,6 +824,9 @@ public class ActiveMQSessionContext extends SessionContext {
|
||||||
channel.send(chunkPacket);
|
channel.send(chunkPacket);
|
||||||
}
|
}
|
||||||
return chunkPacket.getPacketSize();
|
return chunkPacket.getPacketSize();
|
||||||
|
} catch (Throwable e) {
|
||||||
|
throw new ActiveMQException(e.getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -294,8 +294,15 @@ public class NettyConnection implements Connection {
|
||||||
write(buffer, flush, batched, null);
|
write(buffer, flush, batched, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void checkConnectionState() {
|
||||||
|
if (this.closed || !this.channel.isActive()) {
|
||||||
|
throw new IllegalStateException("Connection " + getID() + " closed or disconnected");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final boolean blockUntilWritable(final int requiredCapacity, final long timeout, final TimeUnit timeUnit) {
|
public final boolean blockUntilWritable(final int requiredCapacity, final long timeout, final TimeUnit timeUnit) {
|
||||||
|
checkConnectionState();
|
||||||
final boolean isAllowedToBlock = isAllowedToBlock();
|
final boolean isAllowedToBlock = isAllowedToBlock();
|
||||||
if (!isAllowedToBlock) {
|
if (!isAllowedToBlock) {
|
||||||
|
|
||||||
|
@ -324,6 +331,8 @@ public class NettyConnection implements Connection {
|
||||||
}
|
}
|
||||||
boolean canWrite;
|
boolean canWrite;
|
||||||
while (!(canWrite = canWrite(requiredCapacity)) && System.nanoTime() < deadline) {
|
while (!(canWrite = canWrite(requiredCapacity)) && System.nanoTime() < deadline) {
|
||||||
|
//periodically check the connection state
|
||||||
|
checkConnectionState();
|
||||||
LockSupport.parkNanos(parkNanos);
|
LockSupport.parkNanos(parkNanos);
|
||||||
}
|
}
|
||||||
return canWrite;
|
return canWrite;
|
||||||
|
@ -361,9 +370,7 @@ public class NettyConnection implements Connection {
|
||||||
if (logger.isDebugEnabled()) {
|
if (logger.isDebugEnabled()) {
|
||||||
final int remainingBytes = this.writeBufferHighWaterMark - readableBytes;
|
final int remainingBytes = this.writeBufferHighWaterMark - readableBytes;
|
||||||
if (remainingBytes < 0) {
|
if (remainingBytes < 0) {
|
||||||
logger.debug("a write request is exceeding by " + (-remainingBytes) +
|
logger.debug("a write request is exceeding by " + (-remainingBytes) + " bytes the writeBufferHighWaterMark size [ " + this.writeBufferHighWaterMark + " ] : consider to set it at least of " + readableBytes + " bytes");
|
||||||
" bytes the writeBufferHighWaterMark size [ " + this.writeBufferHighWaterMark +
|
|
||||||
" ] : consider to set it at least of " + readableBytes + " bytes");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//no need to lock because the Netty's channel is thread-safe
|
//no need to lock because the Netty's channel is thread-safe
|
||||||
|
|
|
@ -53,6 +53,7 @@ public interface Connection {
|
||||||
* @param timeout the maximum time to wait
|
* @param timeout the maximum time to wait
|
||||||
* @param timeUnit the time unit of the timeout argument
|
* @param timeUnit the time unit of the timeout argument
|
||||||
* @return {@code true} if the connection can enqueue {@code requiredCapacity} bytes, {@code false} otherwise
|
* @return {@code true} if the connection can enqueue {@code requiredCapacity} bytes, {@code false} otherwise
|
||||||
|
* @throws IllegalStateException if the connection is closed
|
||||||
*/
|
*/
|
||||||
default boolean blockUntilWritable(final int requiredCapacity, final long timeout, final TimeUnit timeUnit) {
|
default boolean blockUntilWritable(final int requiredCapacity, final long timeout, final TimeUnit timeUnit) {
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -19,6 +19,7 @@ package org.apache.activemq.artemis.tests.unit.core.remoting.impl.netty;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
import io.netty.channel.ChannelInboundHandlerAdapter;
|
import io.netty.channel.ChannelInboundHandlerAdapter;
|
||||||
|
@ -73,6 +74,16 @@ public class NettyConnectionTest extends ActiveMQTestBase {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test(expected = IllegalStateException.class)
|
||||||
|
public void throwsExceptionOnBlockUntilWritableIfClosed() {
|
||||||
|
EmbeddedChannel channel = createChannel();
|
||||||
|
NettyConnection conn = new NettyConnection(emptyMap, channel, new MyListener(), false, false);
|
||||||
|
conn.close();
|
||||||
|
//to make sure the channel is closed it needs to run the pending tasks
|
||||||
|
channel.runPendingTasks();
|
||||||
|
conn.blockUntilWritable(0, 0, TimeUnit.NANOSECONDS);
|
||||||
|
}
|
||||||
|
|
||||||
private static EmbeddedChannel createChannel() {
|
private static EmbeddedChannel createChannel() {
|
||||||
return new EmbeddedChannel(new ChannelInboundHandlerAdapter());
|
return new EmbeddedChannel(new ChannelInboundHandlerAdapter());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue