diff --git a/src/main/java/com/rabbitmq/client/impl/AMQCommand.java b/src/main/java/com/rabbitmq/client/impl/AMQCommand.java index 3056fa6d5..bf0ddbb7b 100644 --- a/src/main/java/com/rabbitmq/client/impl/AMQCommand.java +++ b/src/main/java/com/rabbitmq/client/impl/AMQCommand.java @@ -49,11 +49,13 @@ public class AMQCommand implements Command { private final CommandAssembler assembler; private final Lock assemblerLock = new ReentrantLock(); private final WriteListener writeListener; + private final Runnable onEncoded; /** Construct a command for inbound frame assembly with a max body length. */ AMQCommand(int maxBodyLength) { this.assembler = new CommandAssembler(null, null, maxBodyLength); this.writeListener = null; + this.onEncoded = null; } /** Construct a command ready to fill in by reading frames. */ @@ -68,6 +70,7 @@ public AMQCommand() { public AMQCommand(com.rabbitmq.client.Method method) { this.assembler = new CommandAssembler((Method) method, null, Integer.MAX_VALUE); this.writeListener = null; + this.onEncoded = null; } /** @@ -89,8 +92,15 @@ public AMQCommand(com.rabbitmq.client.Method method, AMQContentHeader contentHea */ public AMQCommand(com.rabbitmq.client.Method method, AMQContentHeader contentHeader, ByteBuffer body, WriteListener writeListener) { + this(method, contentHeader, body, writeListener, null); + } + + /** Construct a command that runs {@code onEncoded} once it is encoded, right before its first frame is written. */ + AMQCommand(com.rabbitmq.client.Method method, AMQContentHeader contentHeader, ByteBuffer body, + WriteListener writeListener, Runnable onEncoded) { this.assembler = new CommandAssembler((Method) method, contentHeader, body); this.writeListener = writeListener; + this.onEncoded = onEncoded; } /** Public API - {@inheritDoc} */ @@ -141,7 +151,11 @@ public void transmit(AMQChannel channel) throws IOException { String msg = String.format("Content headers exceeded max frame size: %d > %d", headerFrame.size(), frameMax); throw new IllegalArgumentException(msg); } - connection.writeFrame(m.toFrame(channelNumber)); + Frame methodFrame = m.toFrame(channelNumber); + if (onEncoded != null) { + onEncoded.run(); + } + connection.writeFrame(methodFrame); connection.writeFrame(headerFrame); if (body != null) { diff --git a/src/main/java/com/rabbitmq/client/impl/ChannelN.java b/src/main/java/com/rabbitmq/client/impl/ChannelN.java index a113a8f6c..f73961afa 100644 --- a/src/main/java/com/rabbitmq/client/impl/ChannelN.java +++ b/src/main/java/com/rabbitmq/client/impl/ChannelN.java @@ -790,14 +790,6 @@ public void basicPublish(String exchange, String routingKey, WriteListener listener) throws IOException { - final long deliveryTag; - if (nextPublishSeqNo > 0) { - deliveryTag = getNextPublishSeqNo(); - unconfirmedSet.add(deliveryTag); - nextPublishSeqNo++; - } else { - deliveryTag = 0; - } if (props == null) { props = MessageProperties.MINIMAL_BASIC; } @@ -807,9 +799,18 @@ public void basicPublish(String exchange, String routingKey, .mandatory(mandatory) .immediate(immediate) .build(); + // the number is taken once the message is encoded, as the broker only counts messages it receives + final long[] deliveryTag = new long[1]; + Runnable takeDeliveryTag = () -> { + if (nextPublishSeqNo > 0) { + deliveryTag[0] = getNextPublishSeqNo(); + unconfirmedSet.add(deliveryTag[0]); + nextPublishSeqNo++; + } + }; try { ObservationCollector.PublishCall publishCall = properties -> { - AMQCommand command = new AMQCommand(publish, properties, body, listener); + AMQCommand command = new AMQCommand(publish, properties, body, listener, takeDeliveryTag); transmit(command); }; observationCollector.publish(publishCall, publish, props, body, this.connectionInfo()); @@ -817,7 +818,7 @@ public void basicPublish(String exchange, String routingKey, metricsCollector.basicPublishFailure(this, e); throw e; } - metricsCollector.basicPublish(this, deliveryTag); + metricsCollector.basicPublish(this, deliveryTag[0]); } /** Public API - {@inheritDoc} */ diff --git a/src/test/java/com/rabbitmq/client/test/ChannelNTest.java b/src/test/java/com/rabbitmq/client/test/ChannelNTest.java index 2a690f14c..f87d7dd1c 100644 --- a/src/test/java/com/rabbitmq/client/test/ChannelNTest.java +++ b/src/test/java/com/rabbitmq/client/test/ChannelNTest.java @@ -19,16 +19,22 @@ import com.rabbitmq.client.Command; import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.Method; +import com.rabbitmq.client.NoOpMetricsCollector; import com.rabbitmq.client.TrafficListener; import com.rabbitmq.client.impl.*; +import com.rabbitmq.client.observation.ObservationCollector; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import java.util.Collections; +import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.TimeoutException; import java.util.stream.Stream; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -156,6 +162,69 @@ public void confirmSelectOnlySendsRPCCallOnce() throws Exception { Mockito.verify(trafficListener, Mockito.times(1)).write(Mockito.any(Command.class)); } + @Test + public void publishFailingBeforeSendingDoesNotConsumeSequenceNumber() throws Exception { + ChannelN channel = channelInConfirmMode(ObservationCollector.NO_OP); + + AMQP.BasicProperties unsupportedHeader = new AMQP.BasicProperties.Builder() + .headers(Collections.singletonMap("id", UUID.randomUUID())) + .build(); + assertThatThrownBy(() -> channel.basicPublish("", "q", unsupportedHeader, new byte[0])) + .isInstanceOf(IllegalArgumentException.class); + assertThat(channel.getNextPublishSeqNo()).isEqualTo(1); + assertThat(channel.waitForConfirms(100)).isTrue(); + + assertThatThrownBy(() -> channel.basicPublish("", null, null, new byte[0])) + .isInstanceOf(IllegalStateException.class); + assertThat(channel.getNextPublishSeqNo()).isEqualTo(1); + + String overlongRoutingKey = String.join("", Collections.nCopies(256, "a")); + assertThatThrownBy(() -> channel.basicPublish("", overlongRoutingKey, null, new byte[0])) + .isInstanceOf(IllegalArgumentException.class); + assertThat(channel.getNextPublishSeqNo()).isEqualTo(1); + + channel.basicPublish("", "q", null, new byte[0]); + channel.handleCompleteInboundCommand(new AMQCommand(new AMQImpl.Basic.Ack(1, false))); + assertThat(channel.waitForConfirms(1000)).isTrue(); + } + + @Test + public void publishFailingAfterSendingKeepsSequenceNumber() throws Exception { + ObservationCollector observationCollector = Mockito.mock(ObservationCollector.class); + Mockito.doAnswer(invocation -> { + ObservationCollector.PublishCall call = invocation.getArgument(0); + call.publish(invocation.getArgument(2)); + throw new IllegalArgumentException("failure after the message was sent"); + }).when(observationCollector).publish( + Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any()); + ChannelN channel = channelInConfirmMode(observationCollector); + + assertThatThrownBy(() -> channel.basicPublish("", "q", null, new byte[0])) + .isInstanceOf(IllegalArgumentException.class); + assertThat(channel.getNextPublishSeqNo()).isEqualTo(2); + assertThatThrownBy(() -> channel.waitForConfirms(100)).isInstanceOf(TimeoutException.class); + + channel.handleCompleteInboundCommand(new AMQCommand(new AMQImpl.Basic.Ack(1, false))); + assertThat(channel.waitForConfirms(1000)).isTrue(); + } + + private ChannelN channelInConfirmMode(ObservationCollector observationCollector) throws Exception { + AMQConnection connection = Mockito.mock(AMQConnection.class); + TrafficListener trafficListener = Mockito.mock(TrafficListener.class); + Mockito.when(connection.getTrafficListener()).thenReturn(trafficListener); + ChannelN channel = new ChannelN(connection, 1, consumerWorkService, + new NoOpMetricsCollector(), observationCollector); + Mockito.doAnswer(invocation -> { + Command command = invocation.getArgument(0); + if (command.getMethod() instanceof AMQP.Confirm.Select) { + channel.handleCompleteInboundCommand(new AMQCommand(new AMQImpl.Confirm.SelectOk())); + } + return null; + }).when(trafficListener).write(Mockito.any(Command.class)); + channel.confirmSelect(); + return channel; + } + private AMQConnection connectionAcceptingConsumerCancelOk( boolean accepts, TrafficListener trafficListener) { AMQConnection connection = Mockito.mock(AMQConnection.class);