[ https://issues.apache.org/jira/browse/ARTEMIS-4558?focusedWorklogId=898980&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-898980 ]
ASF GitHub Bot logged work on ARTEMIS-4558: ------------------------------------------- Author: ASF GitHub Bot Created on: 10/Jan/24 13:08 Start Date: 10/Jan/24 13:08 Worklog Time Spent: 10m Work Description: gemmellr commented on code in PR #4734: URL: https://github.com/apache/activemq-artemis/pull/4734#discussion_r1447347508 ########## tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java: ########## @@ -0,0 +1,303 @@ +/* + * 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.soak.brokerConnection.mirror; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.TransactionRolledBackException; +import java.io.File; +import java.io.StringWriter; +import java.lang.invoke.MethodHandles; +import java.util.Properties; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.activemq.artemis.api.core.management.SimpleManagement; +import org.apache.activemq.artemis.core.config.amqpBrokerConnectivity.AMQPBrokerConnectionAddressType; +import org.apache.activemq.artemis.tests.soak.SoakTestBase; +import org.apache.activemq.artemis.tests.util.CFUtil; +import org.apache.activemq.artemis.tests.util.Wait; +import org.apache.activemq.artemis.util.ServerUtil; +import org.apache.activemq.artemis.utils.cli.helper.HelperCreate; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class IdempotentACKTest extends SoakTestBase { + + private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + private static String largeBody; + + static { + StringWriter writer = new StringWriter(); + while (writer.getBuffer().length() < 1024 * 1024) { + writer.append("This is a large string ..... "); + } + largeBody = writer.toString(); + } + + private static final String QUEUE_NAME = "myQueue"; + + public static final String DC1_NODE_A = "idempotentMirror/DC1"; + public static final String DC2_NODE_A = "idempotentMirror/DC2"; + + Process processDC1_node_A; + Process processDC2_node_A; + + private static String DC1_NODEA_URI = "tcp://localhost:61616"; + private static String DC2_NODEA_URI = "tcp://localhost:61618"; + + private static void createServer(String serverName, + String connectionName, + String mirrorURI, + int porOffset) throws Exception { + File serverLocation = getFileServerLocation(serverName); + deleteDirectory(serverLocation); + + HelperCreate cliCreateServer = new HelperCreate(); + cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation); + cliCreateServer.setMessageLoadBalancing("ON_DEMAND"); + cliCreateServer.setClustered(false); + cliCreateServer.setNoWeb(true); + cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); + cliCreateServer.addArgs("--queues", QUEUE_NAME); + cliCreateServer.setPortOffset(porOffset); + cliCreateServer.createServer(); + + Properties brokerProperties = new Properties(); + brokerProperties.put("AMQPConnections." + connectionName + ".uri", mirrorURI); + brokerProperties.put("AMQPConnections." + connectionName + ".retryInterval", "1000"); + brokerProperties.put("AMQPConnections." + connectionName + ".type", AMQPBrokerConnectionAddressType.MIRROR.toString()); + brokerProperties.put("AMQPConnections." + connectionName + ".connectionElements.mirror.sync", "false"); + brokerProperties.put("largeMessageSync", "false"); + File brokerPropertiesFile = new File(serverLocation, "broker.properties"); + saveProperties(brokerProperties, brokerPropertiesFile); + } + + @BeforeClass + public static void createServers() throws Exception { + createServer(DC1_NODE_A, "mirror", DC2_NODEA_URI, 0); + createServer(DC2_NODE_A, "mirror", DC1_NODEA_URI, 2); + } + + private void startServers() throws Exception { + processDC1_node_A = startServer(DC1_NODE_A, -1, -1, new File(getServerLocation(DC1_NODE_A), "broker.properties")); + processDC2_node_A = startServer(DC2_NODE_A, -1, -1, new File(getServerLocation(DC2_NODE_A), "broker.properties")); + + ServerUtil.waitForServerToStart(0, 10_000); + ServerUtil.waitForServerToStart(2, 10_000); + } + + @Before + public void cleanupServers() { + cleanupData(DC1_NODE_A); + cleanupData(DC2_NODE_A); + } + + private void transactSend(Session session, MessageProducer producer, int initialCounter, int numberOfMessages) throws Throwable { + try { + for (int i = initialCounter; i < initialCounter + numberOfMessages; i++) { + TextMessage message; + message = session.createTextMessage(largeBody); + message.setIntProperty("i", i); + message.setBooleanProperty("large", true); + String unique = "Unique " + i; + message.setStringProperty(org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID.toString(), unique); + producer.send(message); + } + session.commit(); + } catch (JMSException e) { + if (e instanceof TransactionRolledBackException && e.getMessage().contains("Duplicate message detected")) { + logger.debug("OK Exception {}", e.getMessage(), e); + return; // ok + } else { + logger.warn("Not OK Exception {}", e.getMessage(), e); + throw e; + } + } + } + + + @Test + public void testAMQP() throws Exception { + testACKs("AMQP"); + } + + @Test + public void testCORE() throws Exception { + testACKs("CORE"); + } + + private void testACKs(final String protocol) throws Exception { + startServers(); + + final int consumers = 10; + final int numberOfMessages = 300; + final int messagesPerConsumer = numberOfMessages / consumers; + + // Just a reminder: if you change number on this test, this needs to be true: + Assert.assertEquals("Invalid test config", 0, numberOfMessages % consumers); + + AtomicBoolean running = new AtomicBoolean(true); + runAfter(() -> running.set(false)); + + String snfQueue = "$ACTIVEMQ_ARTEMIS_MIRROR_mirror"; + + ExecutorService executor = Executors.newFixedThreadPool(consumers); + runAfter(executor::shutdownNow); + ConnectionFactory connectionFactoryDC1A = CFUtil.createConnectionFactory(protocol, DC1_NODEA_URI); + CountDownLatch sendDone = new CountDownLatch(1); + CountDownLatch killSend = new CountDownLatch(1); + + executor.execute(() -> { + int messagesSent = 0; + while (running.get() && messagesSent < numberOfMessages) { + try (Connection connection = connectionFactoryDC1A.createConnection()) { + Session session = connection.createSession(true, Session.SESSION_TRANSACTED); + Queue queue = session.createQueue(QUEUE_NAME); + MessageProducer producer = session.createProducer(queue); + if (messagesSent < 100) { + transactSend(session, producer, messagesSent, 1); + messagesSent++; + logger.debug("Sent {}", messagesSent); + if (messagesSent == 100) { + logger.debug("Signal to kill"); + killSend.countDown(); + } + } else { + transactSend(session, producer, messagesSent, 100); + messagesSent += 100; + logger.debug("Sent {}", messagesSent); + } + } catch (Throwable e) { + logger.debug(e.getMessage(), e); + try { + Thread.sleep(100); + } catch (Throwable ignored) { + } + } + } + sendDone.countDown(); + }); + + Assert.assertTrue(killSend.await(50, TimeUnit.SECONDS)); + + restartDC1_ServerA(); + + Assert.assertTrue(sendDone.await(50, TimeUnit.SECONDS)); + + SimpleManagement simpleManagementDC1A = new SimpleManagement(DC1_NODEA_URI, null, null); + SimpleManagement simpleManagementDC2A = new SimpleManagement(DC2_NODEA_URI, null, null); + + Wait.assertEquals(0, () -> getCount(simpleManagementDC1A, snfQueue)); + Wait.assertEquals(numberOfMessages, () -> getCount(simpleManagementDC1A, QUEUE_NAME)); + Wait.assertEquals(numberOfMessages, () -> getCount(simpleManagementDC2A, QUEUE_NAME)); + + CountDownLatch latchKill = new CountDownLatch(consumers); + + CountDownLatch latchDone = new CountDownLatch(consumers); + + Runnable runnableConsumer = () -> { + int messagesConsumed = 0; + while (running.get() && messagesConsumed < messagesPerConsumer) { + try (Connection connection = connectionFactoryDC1A.createConnection()) { + Session session = connection.createSession(true, Session.SESSION_TRANSACTED); + Queue queue = session.createQueue(QUEUE_NAME); + MessageConsumer consumer = session.createConsumer(queue); + connection.start(); + while (messagesConsumed < messagesPerConsumer) { + Message message = consumer.receive(100); + if (!(message instanceof TextMessage)) { + logger.debug("message received={}", message); + session.commit(); + messagesConsumed++; + logger.debug("Received {}", messagesConsumed); + if (messagesConsumed == 10) { + latchKill.countDown(); + } + } Review Comment: The change after the prior feedback looks to have changed this bit significantly vs what it did before, as it now increments messagesConsumed _only if no TextMessage is received_? So it will complete once it fails to consume (or gets non TextMessage) 10 times, consuming as much as it possibly can before then. Was it meant to make that change, or instead have become "if (message instanceof TextMessage)" at the start? Assuming the latter, catching unexpected stuff like that is another reason I suggested the subsequent 'consume the remainder of messages' bit later could even assert how many it consumed once it counted them, since it should be predictable if all the earlier consumers have a specific quota. Issue Time Tracking ------------------- Worklog Id: (was: 898980) Time Spent: 1h 50m (was: 1h 40m) > AMQP Mirror ACKS should be idempotent > ------------------------------------- > > Key: ARTEMIS-4558 > URL: https://issues.apache.org/jira/browse/ARTEMIS-4558 > Project: ActiveMQ Artemis > Issue Type: Bug > Reporter: Clebert Suconic > Assignee: Clebert Suconic > Priority: Major > Fix For: 2.32.0 > > Time Spent: 1h 50m > Remaining Estimate: 0h > > When I first developed Mirroring, I assumed sending the mirrored ACK on a > aferACK and disconnected from any other transactions would be enough, with > the caveat you could get a duplicate delivery on the target mirror in case of > failures. > I got some complains that this is not safe enough from some users, and I'm > making this now idempotent. > I took an overal mirroring hardening approach and I'm improving test coverage > for this improvement. -- This message was sent by Atlassian Jira (v8.20.10#820010)