ARTEMIS-4313 Retry Bridge when destination full and configured to FAIL

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java

@@ -27,6 +27,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.activemq.artemis.api.core.ActiveMQAddressFullException;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
 import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
@@ -456,7 +457,13 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
       }
    }
 
-   // Consumer implementation ---------------------------------------
+   @Override
+   public void sendFailed(Message message, Exception e) {
+      if (e instanceof ActiveMQAddressFullException) {
+         logger.warn(e.getMessage(), e);
+         failed(e);
+      }
+   }
 
    @Override
    public void sendAcknowledged(final Message message) {
@@ -713,8 +720,6 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
 
    @Override
    public void beforeReconnect(final ActiveMQException exception) {
-      // log.warn("{}::Connection failed before reconnect ", name, exception);
-      // fail(false);
    }
 
    private void deliverLargeMessage(final SimpleString dest,

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/bridge/BridgeRetryFullFailureTest.java

@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.bridge;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import java.util.Arrays;
+import java.util.HashSet;
+
+import org.apache.activemq.artemis.api.core.QueueConfiguration;
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.BridgeConfiguration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.ComponentConfigurationRoutingType;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.tests.util.CFUtil;
+import org.apache.activemq.artemis.tests.util.Wait;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class BridgeRetryFullFailureTest extends ActiveMQTestBase {
+
+   private ActiveMQServer server0;
+   private ActiveMQServer server1;
+
+   private String getServer0URL() {
+      return "tcp://localhost:61616";
+   }
+
+   private String getServer1URL() {
+      return "tcp://localhost:61617";
+   }
+
+   @Override
+   @Before
+   public void setUp() throws Exception {
+      super.setUp();
+      server0 = createServer(false, createBasicConfig());
+      server1 = createServer(false, createBasicConfig());
+      server1.getConfiguration().clearAddressSettings();
+      server1.getConfiguration().addAddressSetting("#", new AddressSettings().setMaxSizeMessages(10).setMaxSizeBytes(10000).setAddressFullMessagePolicy(AddressFullMessagePolicy.FAIL));
+      server0.getConfiguration().addAcceptorConfiguration("acceptor", getServer0URL());
+      server0.getConfiguration().addConnectorConfiguration("connector", getServer1URL());
+      server1.getConfiguration().addAcceptorConfiguration("acceptor", getServer1URL());
+      server0.start();
+      server1.start();
+   }
+
+   @Test
+   public void testFullServer() throws Exception {
+      SimpleString source = SimpleString.toSimpleString("source");
+      SimpleString destination = SimpleString.toSimpleString("destination");
+
+      server0.createQueue(new QueueConfiguration(source).setRoutingType(RoutingType.ANYCAST));
+      Queue queueServer1 = server1.createQueue(new QueueConfiguration(destination).setRoutingType(RoutingType.ANYCAST));
+
+      server0.deployBridge(new BridgeConfiguration().setRoutingType(ComponentConfigurationRoutingType.ANYCAST).setName("bridge").setForwardingAddress(destination.toString()).setQueueName(source.toString()).setConfirmationWindowSize(10).setStaticConnectors(Arrays.asList("connector")).setRetryInterval(100).setReconnectAttempts(-1));
+
+      ConnectionFactory factory0 = CFUtil.createConnectionFactory("CORE", getServer0URL());
+      ConnectionFactory factory1 = CFUtil.createConnectionFactory("CORE", getServer1URL());
+
+      int NUMBER_OF_MESSAGES = 1000;
+
+      AssertionLoggerHandler.startCapture();
+      runAfter(AssertionLoggerHandler::stopCapture);
+
+      try (Connection connection = factory0.createConnection()) {
+         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         MessageProducer producer = session.createProducer(session.createQueue(source.toString()));
+         producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+         for (int i = 0; i < NUMBER_OF_MESSAGES; i++) {
+            Message message = session.createMessage();
+            message.setIntProperty("i", i);
+            producer.send(message);
+         }
+      }
+
+      Wait.assertTrue(() -> AssertionLoggerHandler.findText("AMQ229102"));
+
+      // the reconnects and failure may introduce out of order issues. so we just check if they were all received
+      HashSet<Integer> receivedIntegers = new HashSet<>();
+
+      try (Connection connection = factory1.createConnection()) {
+         connection.start();
+         Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         MessageConsumer consumer = session.createConsumer(session.createQueue(destination.toString()));
+         for (int i = 0; i < NUMBER_OF_MESSAGES; i++) {
+            Message message = consumer.receive(5000);
+            Assert.assertNotNull(message);
+            Assert.assertFalse(receivedIntegers.contains(message.getIntProperty("i")));
+            receivedIntegers.add(message.getIntProperty("i"));
+         }
+         Assert.assertNull(consumer.receiveNoWait());
+      }
+
+      for (int i = 0; i < NUMBER_OF_MESSAGES; i++) {
+         Assert.assertTrue(receivedIntegers.contains(i));
+      }
+      // please bear with my OCD here
+      // this is a moot check as I checked for all the elements
+      // but I still wanted the extra validation here
+      Assert.assertEquals(NUMBER_OF_MESSAGES, receivedIntegers.size());
+
+   }
+}