From 3458caf7345580cfb56876d0feba77c5e15e760c Mon Sep 17 00:00:00 2001 From: gchuf Date: Tue, 27 Jan 2026 14:29:05 +0100 Subject: [PATCH 1/2] ARTEMIS-5859 Rename bindings and journal files --- .../artemis/cli/commands/Upgrade.java | 36 ++++++++++++++++--- .../cli/commands/tools/RecoverMessages.java | 4 +-- .../tools/journal/CompactJournal.java | 4 +-- .../commands/tools/journal/DecodeJournal.java | 4 +-- .../commands/tools/journal/EncodeJournal.java | 4 +-- .../impl/journal/DescribeJournal.java | 4 +-- .../impl/journal/JournalStorageManager.java | 4 +-- .../core/server/replay/ReplayManager.java | 2 +- docs/user-manual/data-tools.adoc | 4 +-- docs/user-manual/persistence.adoc | 4 +-- .../artemis/tests/util/ActiveMQTestBase.java | 10 +++--- ...ShutdownOnCriticalIOErrorMoveNextTest.java | 2 +- .../amqp/connect/AMQPMirrorFastACKTest.java | 2 +- .../amqp/connect/AMQPSyncMirrorTest.java | 2 +- .../integration/client/HangConsumerTest.java | 2 +- .../client/RedeliveryConsumerTest.java | 2 +- .../cluster/bridge/BridgeTest.java | 2 +- .../journal/JournalCompactSplitTest.java | 4 +-- .../persistence/ExportFormatTest.java | 16 ++++----- ...aredNothingReplicationFlowControlTest.java | 4 +-- .../SharedNothingReplicationTest.java | 4 +-- .../journal/JournalImplTestUnit.java | 6 ++-- .../JournalCleanupCompactStressTest.java | 2 +- .../NIOMultiThreadCompactorStressTest.java | 2 +- .../impl/BatchIDGeneratorUnitTest.java | 2 +- 25 files changed, 80 insertions(+), 52 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java index a4f1d04b588..c69eeed32a4 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java @@ -171,14 +171,15 @@ public Object run(ActionContext context) throws Exception { File artemisUtilityProfileCmdTmp = new File(tmp, Create.ETC_ARTEMIS_UTILITY_PROFILE_CMD); File artemisUtilityProfileCmdBkp = new File(etcBkp, Create.ETC_ARTEMIS_UTILITY_PROFILE_CMD); + dataFolder = getDATA(context, dataFolder, artemisProfileCmd, "set ARTEMIS_DATA_DIR="); + renameDataFiles(dataFolder); + if (artemisUtilityProfileCmd.exists()) { write("etc/" + Create.ETC_ARTEMIS_UTILITY_PROFILE_CMD, artemisUtilityProfileCmdTmp, filters, false, false); upgradeJDK(context, JDK_PREFIX_WINDOWS, "", KEEPING_JVM_ARGUMENTS_ALTERNATES, KEEPING_JVM_ARGUMENTS, artemisUtilityProfileCmdTmp, artemisUtilityProfileCmd, artemisUtilityProfileCmdBkp, Collections.emptyMap(), "set ARTEMIS_INSTANCE=\"", "set ARTEMIS_DATA_DIR="); } else { if (data == null || data.equals("data")) { - dataFolder = getDATA(context, dataFolder, artemisProfileCmd, "set ARTEMIS_DATA_DIR="); - Create.addScriptFilters(filters, getHome(), getInstance(), etcFolder, dataFolder, oomeDumpFile, javaMemory, getJavaOptions(), getJavaUtilityOptions(), "NA"); } @@ -215,14 +216,16 @@ public Object run(ActionContext context) throws Exception { File artemisUtilityProfileTmp = new File(tmp, Create.ETC_ARTEMIS_UTILITY_PROFILE); File artemisUtilityProfileBkp = new File(etcBkp, Create.ETC_ARTEMIS_UTILITY_PROFILE); + dataFolder = getDATA(context, dataFolder, artemisProfile, "ARTEMIS_DATA_DIR="); + + renameDataFiles(dataFolder); + if (artemisUtilityProfile.exists()) { write("etc/" + Create.ETC_ARTEMIS_UTILITY_PROFILE, artemisUtilityProfileTmp, filters, false, false); upgradeJDK(context, JDK_PREFIX_LINUX, "\"", KEEPING_JVM_ARGUMENTS_ALTERNATES, KEEPING_JVM_ARGUMENTS, artemisUtilityProfileTmp, artemisUtilityProfile, artemisUtilityProfileBkp, keepPrefixAlternates, "ARTEMIS_INSTANCE=", "ARTEMIS_DATA_DIR="); } else { if (data == null || data.equals("data")) { - dataFolder = getDATA(context, dataFolder, artemisProfile, "ARTEMIS_DATA_DIR="); - Create.addScriptFilters(filters, getHome(), getInstance(), etcFolder, dataFolder, oomeDumpFile, javaMemory, getJavaOptions(), getJavaUtilityOptions(), "NA"); } @@ -481,4 +484,29 @@ private void removeWars(ActionContext context, File bootstrapXml) throws Excepti } } + + private void renameDataFiles(File dataFolder) throws Exception { + + File journalFilesDirectory = new File(dataFolder, "journal"); + File bindingsFilesDirectory = new File(dataFolder, "bindings"); + + for (File file : journalFilesDirectory.listFiles()) { + String filename = file.getAbsolutePath(); + if (filename.endsWith(".amq")) { + filename = filename.replace("activemq", "artemis"); + File newFile = new File(filename); + file.renameTo(newFile); + } + } + + for (File file : bindingsFilesDirectory.listFiles()) { + String filename = file.getAbsolutePath(); + if (filename.endsWith(".bindings")) { + filename = filename.replace("activemq", "artemis"); + File newFile = new File(filename); + file.renameTo(newFile); + } + } + + } } diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/RecoverMessages.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/RecoverMessages.java index 3d55b995c64..daf3903d5c7 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/RecoverMessages.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/RecoverMessages.java @@ -90,7 +90,7 @@ public static void recover(ActionContext context, Configuration configuration, S SequentialFileFactory outputFF = new NIOSequentialFileFactory(journalOutput, null, 1); outputFF.setDatasync(false); - JournalImpl targetJournal = new JournalImpl(configuration.getJournalFileSize(), 2, 2, -1, 0, outputFF, "activemq-data", "amq", 1); + JournalImpl targetJournal = new JournalImpl(configuration.getJournalFileSize(), 2, 2, -1, 0, outputFF, "artemis-data", "amq", 1); targetJournal.setAutoReclaim(false); targetJournal.start(); @@ -100,7 +100,7 @@ public static void recover(ActionContext context, Configuration configuration, S SequentialFileFactory largeMessagesFF = new NIOSequentialFileFactory(largeMessage, null, 1); // Will use only default values. The load function should adapt to anything different - JournalImpl messagesJournal = new JournalImpl(configuration.getJournalFileSize(), configuration.getJournalMinFiles(), configuration.getJournalPoolFiles(), 0, 0, messagesFF, "activemq-data", "amq", 1); + JournalImpl messagesJournal = new JournalImpl(configuration.getJournalFileSize(), configuration.getJournalMinFiles(), configuration.getJournalPoolFiles(), 0, 0, messagesFF, "artemis-data", "amq", 1); List files = messagesJournal.orderFiles(); diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/CompactJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/CompactJournal.java index 198c94d4949..157640fa9d1 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/CompactJournal.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/CompactJournal.java @@ -44,11 +44,11 @@ public Object execute(ActionContext context) throws Exception { } public static void compactJournals(Configuration configuration) throws Exception { - compactJournal(configuration.getJournalLocation(), configuration.getJournalRetentionLocation(), "activemq-data", "amq", configuration.getJournalMinFiles(), + compactJournal(configuration.getJournalLocation(), configuration.getJournalRetentionLocation(), "artemis-data", "amq", configuration.getJournalMinFiles(), configuration.getJournalPoolFiles(), configuration.getJournalFileSize(), null, JournalRecordIds.UPDATE_DELIVERY_COUNT, JournalRecordIds.SET_SCHEDULED_DELIVERY_TIME); System.out.println("Compactation succeeded for " + configuration.getJournalLocation().getAbsolutePath()); - compactJournal(configuration.getBindingsLocation(), null, "activemq-bindings", "bindings", 2, 2, 1048576, null); + compactJournal(configuration.getBindingsLocation(), null, "artemis-bindings", "bindings", 2, 2, 1048576, null); System.out.println("Compactation succeeded for " + configuration.getBindingsLocation()); } diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java index 09ab18b552a..bc7763a42ba 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/DecodeJournal.java @@ -42,8 +42,8 @@ public class DecodeJournal extends LockAbstract { @Option(names = "--directory", description = "The journal folder. Default: read 'journal-directory' from broker.xml.") public String directory; - @Option(names = "--prefix", description = "The journal prefix. Default: activemq-data.") - public String prefix = "activemq-data"; + @Option(names = "--prefix", description = "The journal prefix. Default: artemis-data.") + public String prefix = "artemis-data"; @Option(names = "--suffix", description = "The journal suffix. Default: amq.") public String suffix = "amq"; diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/EncodeJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/EncodeJournal.java index 6c4cfcc0c28..01518d5c326 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/EncodeJournal.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/journal/EncodeJournal.java @@ -40,8 +40,8 @@ public class EncodeJournal extends LockAbstract { @Option(names = "--directory", description = "The journal folder. Default: read 'journal-directory' from broker.xml.") public String directory; - @Option(names = "--prefix", description = "The journal prefix. Default: activemq-data.") - public String prefix = "activemq-data"; + @Option(names = "--prefix", description = "The journal prefix. Default: artemis-data.") + public String prefix = "artemis-data"; @Option(names = "--suffix", description = "The journal suffix. Default: amq.") public String suffix = "amq"; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java index 6b68993252e..bab833fe260 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java @@ -187,7 +187,7 @@ public static DescribeJournal describeBindingsJournal(final File bindingsDir, Pr SequentialFileFactory bindingsFF = new NIOSequentialFileFactory(bindingsDir, null, 1); - JournalImpl bindings = new JournalImpl(1024 * 1024, 2, 2, -1, 0, bindingsFF, "activemq-bindings", "bindings", 1); + JournalImpl bindings = new JournalImpl(1024 * 1024, 2, 2, -1, 0, bindingsFF, "artemis-bindings", "bindings", 1); return describeJournal(bindingsFF, bindings, bindingsDir, out, safe, printRecords, printSurviving, reclaimed); } @@ -200,7 +200,7 @@ public static DescribeJournal describeMessagesJournal(final File messagesDir, Pr SequentialFileFactory messagesFF = new NIOSequentialFileFactory(messagesDir, null, 1); // Will use only default values. The load function should adapt to anything different - JournalImpl messagesJournal = new JournalImpl(configuration.getJournalFileSize(), configuration.getJournalMinFiles(), configuration.getJournalPoolFiles(), 0, 0, messagesFF, "activemq-data", "amq", 1); + JournalImpl messagesJournal = new JournalImpl(configuration.getJournalFileSize(), configuration.getJournalMinFiles(), configuration.getJournalPoolFiles(), 0, 0, messagesFF, "artemis-data", "amq", 1); return describeJournal(messagesFF, messagesJournal, messagesDir, out, safe, printRecords, printSurviving, reclaimed); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java index 8823927a894..fddbf3b9527 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java @@ -77,7 +77,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - public static final String ACTIVEMQ_DATA = "activemq-data"; + public static final String ACTIVEMQ_DATA = "artemis-data"; protected SequentialFileFactory journalFF; @@ -148,7 +148,7 @@ protected void init(Configuration config, IOCriticalErrorListener criticalErrorL bindingsFF = new NIOSequentialFileFactory(config.getBindingsLocation(), criticalErrorListener, config.getJournalMaxIO_NIO()); bindingsFF.setDatasync(config.isJournalDatasync()); - Journal localBindings = new JournalImpl(ioExecutorFactory, 1024 * 1024, 2, config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), bindingsFF, "activemq-bindings", "bindings", 1, 0, criticalErrorListener, config.getJournalMaxAtticFiles()); + Journal localBindings = new JournalImpl(ioExecutorFactory, 1024 * 1024, 2, config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), bindingsFF, "artemis-bindings", "bindings", 1, 0, criticalErrorListener, config.getJournalMaxAtticFiles()); bindingsJournal = localBindings; originalBindingsJournal = localBindings; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java index 90af9722d2e..a1f6021a311 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/replay/ReplayManager.java @@ -105,7 +105,7 @@ public void replay(Date start, Date end, String sourceAddress, String targetAddr SequentialFileFactory messagesFF = new NIOSequentialFileFactory(retentionFolder, null, 1); // Will use only default values. The load function should adapt to anything different - JournalImpl messagesJournal = new JournalImpl(server.getConfiguration().getJournalFileSize(), server.getConfiguration().getJournalMinFiles(), server.getConfiguration().getJournalPoolFiles(), 0, 0, messagesFF, "activemq-data", "amq", 1); + JournalImpl messagesJournal = new JournalImpl(server.getConfiguration().getJournalFileSize(), server.getConfiguration().getJournalMinFiles(), server.getConfiguration().getJournalPoolFiles(), 0, 0, messagesFF, "artemis-data", "amq", 1); List files = messagesJournal.orderFiles(); diff --git a/docs/user-manual/data-tools.adoc b/docs/user-manual/data-tools.adoc index 11d60d23089..afdc45403d3 100644 --- a/docs/user-manual/data-tools.adoc +++ b/docs/user-manual/data-tools.adoc @@ -388,7 +388,7 @@ COMMANDS With --paging option, The folder used for paging (default from broker.xml) - With --prefix option, The journal prefix (default activemq-data) + With --prefix option, The journal prefix (default artemis-data) With --suffix option, The journal suffix (default amq) @@ -419,7 +419,7 @@ COMMANDS With --paging option, The folder used for paging (default from broker.xml) - With --prefix option, The journal prefix (default activemq-data) + With --prefix option, The journal prefix (default artemis-data) With --suffix option, The journal suffix (default amq) diff --git a/docs/user-manual/persistence.adoc b/docs/user-manual/persistence.adoc index d730905caf5..b4f6ec5c8ac 100644 --- a/docs/user-manual/persistence.adoc +++ b/docs/user-manual/persistence.adoc @@ -80,7 +80,7 @@ It also stores data such as id sequence counters. + The bindings journal is always a NIO journal as it is typically low throughput compared to the message journal. + -The files on this journal are prefixed as `activemq-bindings`. +The files on this journal are prefixed as `artemis-bindings`. Each file has a `bindings` extension. File size is `1048576`, and it is located at the bindings folder. @@ -91,7 +91,7 @@ This journal instance stores all message related data, including the message the By default, the broker will try to use an AIO journal. If AIO is not available, e.g. the platform is not Linux with the correct kernel version or AIO has not been installed then it will automatically fall back to using Java NIO which is available on any Java platform. + -The files on this journal are prefixed as `activemq-data`. +The files on this journal are prefixed as `artemis-data`. Each file has an `amq` extension. File size is by the default `10485760` (configurable), and it is located at the journal folder. diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java index 58ca423847e..64174e1f360 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java @@ -1731,7 +1731,7 @@ protected Pair, List> loadMessageJourn try { SequentialFileFactory messagesFF = new NIOSequentialFileFactory(new File(getJournalDir()), null, 1); - messagesJournal = new JournalImpl(config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), 0, 0, messagesFF, "activemq-data", "amq", 1); + messagesJournal = new JournalImpl(config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), 0, 0, messagesFF, "artemis-data", "amq", 1); final List committedRecords = new LinkedList<>(); final List preparedTransactions = new LinkedList<>(); @@ -1764,7 +1764,7 @@ protected HashMap countJournal(File location, int journa final HashMap recordsType = new HashMap<>(); SequentialFileFactory messagesFF = new NIOSequentialFileFactory(location, null, 1); - JournalImpl messagesJournal = new JournalImpl(journalFileSize, minFiles, poolfiles, 0, 0, messagesFF, "activemq-data", "amq", 1); + JournalImpl messagesJournal = new JournalImpl(journalFileSize, minFiles, poolfiles, 0, 0, messagesFF, "artemis-data", "amq", 1); List filesToRead = messagesJournal.orderFiles(); for (JournalFile file : filesToRead) { @@ -1777,7 +1777,7 @@ protected HashMap countBindingJournal(Configuration conf final HashMap recordsType = new HashMap<>(); SequentialFileFactory messagesFF = new NIOSequentialFileFactory(config.getBindingsLocation(), null, 1); - JournalImpl messagesJournal = new JournalImpl(config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), 0, 0, messagesFF, "activemq-bindings", "bindings", 1); + JournalImpl messagesJournal = new JournalImpl(config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), 0, 0, messagesFF, "artemis-bindings", "bindings", 1); List filesToRead = messagesJournal.orderFiles(); for (JournalFile file : filesToRead) { @@ -1807,10 +1807,10 @@ protected HashMap internalCountJournalLivingRecords(Conf if (messageJournal) { ff = new NIOSequentialFileFactory(config.getJournalLocation(), null, 1); - journal = new JournalImpl(config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), 0, 0, ff, "activemq-data", "amq", 1); + journal = new JournalImpl(config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), 0, 0, ff, "artemis-data", "amq", 1); } else { ff = new NIOSequentialFileFactory(config.getBindingsLocation(), null, 1); - journal = new JournalImpl(1024 * 1024, 2, config.getJournalCompactMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactPercentage(), ff, "activemq-bindings", "bindings", 1); + journal = new JournalImpl(1024 * 1024, 2, config.getJournalCompactMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactPercentage(), ff, "artemis-bindings", "bindings", 1); } journal.start(); diff --git a/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/critical/ShutdownOnCriticalIOErrorMoveNextTest.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/critical/ShutdownOnCriticalIOErrorMoveNextTest.java index c2731dd6955..3c8308a497a 100644 --- a/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/critical/ShutdownOnCriticalIOErrorMoveNextTest.java +++ b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/critical/ShutdownOnCriticalIOErrorMoveNextTest.java @@ -89,7 +89,7 @@ protected StorageManager createStorageManager() { protected Journal createMessageJournal(Configuration config, IOCriticalErrorListener criticalErrorListener, int fileSize) { - return new JournalImpl(ioExecutorFactory, fileSize, config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), journalFF, "activemq-data", "amq", journalFF.getMaxIO(), 0, criticalErrorListener, config.getJournalMaxAtticFiles()) { + return new JournalImpl(ioExecutorFactory, fileSize, config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), journalFF, "artemis-data", "amq", journalFF.getMaxIO(), 0, criticalErrorListener, config.getJournalMaxAtticFiles()) { @Override protected void moveNextFile(boolean scheduleReclaim, boolean block) throws Exception { super.moveNextFile(scheduleReclaim, block); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorFastACKTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorFastACKTest.java index 023d21c8846..c14a728e211 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorFastACKTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorFastACKTest.java @@ -200,7 +200,7 @@ private StorageManager createStorageManager(Configuration configuration, protected Journal createMessageJournal(Configuration config, IOCriticalErrorListener criticalErrorListener, int fileSize) { - return new JournalImpl(ioExecutorFactory, fileSize, config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), journalFF, "activemq-data", "amq", journalFF.getMaxIO(), 0, criticalErrorListener, config.getJournalMaxAtticFiles()) { + return new JournalImpl(ioExecutorFactory, fileSize, config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), journalFF, "artemis-data", "amq", journalFF.getMaxIO(), 0, criticalErrorListener, config.getJournalMaxAtticFiles()) { @Override public void appendAddRecordTransactional(long txID, long id, diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java index 50abcfb5fc9..a7fa42564cc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java @@ -406,7 +406,7 @@ private StorageManager createCallbackStorageManager(Configuration configuration, protected Journal createMessageJournal(Configuration config, IOCriticalErrorListener criticalErrorListener, int fileSize) { - return new JournalImpl(ioExecutorFactory, fileSize, config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), journalFF, "activemq-data", "amq", journalFF.getMaxIO(), 0, criticalErrorListener, config.getJournalMaxAtticFiles()) { + return new JournalImpl(ioExecutorFactory, fileSize, config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), config.getJournalFileOpenTimeout(), journalFF, "artemis-data", "amq", journalFF.getMaxIO(), 0, criticalErrorListener, config.getJournalMaxAtticFiles()) { @Override public void appendAddRecordTransactional(long txID, long id, diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java index b8fe187d73c..3a04ee54f65 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java @@ -411,7 +411,7 @@ public void testDuplicateDestinationsOnTopic() throws Exception { SequentialFileFactory messagesFF = new NIOSequentialFileFactory(server.getConfiguration().getBindingsLocation(), null, 1); - JournalImpl messagesJournal = new JournalImpl(1024 * 1024, 2, 2, 0, 0, messagesFF, "activemq-bindings", "bindings", 1); + JournalImpl messagesJournal = new JournalImpl(1024 * 1024, 2, 2, 0, 0, messagesFF, "artemis-bindings", "bindings", 1); messagesJournal.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java index 3087fca1fbe..6abc75c2317 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java @@ -265,7 +265,7 @@ private void internaltestInfiniteDedeliveryMessageOnPersistent(final boolean str server.stop(); - JournalImpl journal = new JournalImpl(server.getConfiguration().getJournalFileSize(), 2, 2, 0, 0, new NIOSequentialFileFactory(server.getConfiguration().getJournalLocation(), 1), "activemq-data", "amq", 1); + JournalImpl journal = new JournalImpl(server.getConfiguration().getJournalFileSize(), 2, 2, 0, 0, new NIOSequentialFileFactory(server.getConfiguration().getJournalLocation(), 1), "artemis-data", "amq", 1); final AtomicInteger updates = new AtomicInteger(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java index 181e6809db7..b550beb16f4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java @@ -2373,7 +2373,7 @@ private void testPendingAcksEventuallyArrive(boolean stop, boolean large) throws protected Map loadQueues(ActiveMQServer serverToInvestigate) throws Exception { SequentialFileFactory messagesFF = new NIOSequentialFileFactory(serverToInvestigate.getConfiguration().getJournalLocation(), 1); - JournalImpl messagesJournal = new JournalImpl(serverToInvestigate.getConfiguration().getJournalFileSize(), serverToInvestigate.getConfiguration().getJournalMinFiles(), serverToInvestigate.getConfiguration().getJournalPoolFiles(), 0, 0, messagesFF, "activemq-data", "amq", 1); + JournalImpl messagesJournal = new JournalImpl(serverToInvestigate.getConfiguration().getJournalFileSize(), serverToInvestigate.getConfiguration().getJournalMinFiles(), serverToInvestigate.getConfiguration().getJournalPoolFiles(), 0, 0, messagesFF, "artemis-data", "amq", 1); List records = new LinkedList<>(); List preparedTransactions = new LinkedList<>(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java index 9d28ef58896..13703a6bc86 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/JournalCompactSplitTest.java @@ -60,7 +60,7 @@ private void createAndCompactJournal(SequentialFileFactory fileFactory) throws E final int minFiles = 2; final int compactMinFiles = 2; final int compactPercentage = 30; - final String filePrefix = "activemq-data"; + final String filePrefix = "artemis-data"; final String fileExtension = "amq"; final int maxAIO = 1024; JournalImpl journalImpl = new JournalImpl(JOURNAL_FILE_SIZE, minFiles, 2, compactMinFiles, compactPercentage, fileFactory, filePrefix, fileExtension, maxAIO, 1); @@ -99,7 +99,7 @@ public void failedTransaction(long transactionID, List records, List } private void createFileWithRecords(SequentialFileFactory fileFactory) throws Exception { - SequentialFile file = fileFactory.createSequentialFile("activemq-data-1.amq", JOURNAL_FILE_SIZE); + SequentialFile file = fileFactory.createSequentialFile("artemis-data-1.amq", JOURNAL_FILE_SIZE); file.open(); file.fill(JOURNAL_FILE_SIZE); file.position(0); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java index 3c0959b0a0e..c087b232138 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java @@ -40,16 +40,16 @@ public class ExportFormatTest extends ActiveMQTestBase { // Case the format was changed, and the change was agreed, use _testCreateFormat to recreate this field String bindingsFile = """ - #File,JournalFileImpl: (activemq-bindings-1.bindings id = 1, recordID = 1) + #File,JournalFileImpl: (artemis-bindings-1.bindings id = 1, recordID = 1) operation@AddRecord,id@1,userRecordType@24,length@8,isUpdate@false,compactCount@0,data@AAAAAH____8= operation@AddRecordTX,txID@2,id@3,userRecordType@21,length@43,isUpdate@false,compactCount@0,data@AAAABEEAMQAAAAAEQQAxAAABAAAAFHUAcwBlAHIAPQBuAHUAbABsADsAAA== operation@Commit,txID@2,numberOfRecords@1 operation@AddRecord,id@20,userRecordType@24,length@8,isUpdate@false,compactCount@0,data@AAAAAAAAABQ= - #File,JournalFileImpl: (activemq-bindings-2.bindings id = 2, recordID = 2)"""; + #File,JournalFileImpl: (artemis-bindings-2.bindings id = 2, recordID = 2)"""; // Case the format was changed, and the change was agreed, use _testCreateFormat to recreate this field String journalFile = """ - #File,JournalFileImpl: (activemq-data-1.amq id = 1, recordID = 1) + #File,JournalFileImpl: (artemis-data-1.amq id = 1, recordID = 1) operation@AddRecordTX,txID@0,id@7,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAHAQAAAARBADEAAAAAPQAAAA0AAAAAAAAABwEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WFoEAQAAAAEAAAAGawBlAHkABgAAAAA= operation@UpdateTX,txID@0,id@7,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM= operation@AddRecordTX,txID@0,id@8,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAIAQAAAARBADEAAAAAPQAAAA0AAAAAAAAACAEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WF4EAQAAAAEAAAAGawBlAHkABgAAAAE= @@ -71,7 +71,7 @@ public class ExportFormatTest extends ActiveMQTestBase { operation@Update,id@18,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM= operation@AddRecord,id@19,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAATAQAAAARBADEAAAAAPQAAAA0AAAAAAAAAEwEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WL4EAQAAAAEAAAAGawBlAHkABgAAAAk= operation@Update,id@19,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM= - #File,JournalFileImpl: (activemq-data-2.amq id = 2, recordID = 2)"""; + #File,JournalFileImpl: (artemis-data-2.amq id = 2, recordID = 2)"""; @Test @Disabled @@ -112,20 +112,20 @@ public void testCreateFormat() throws Exception { System.out.println(); System.out.println("copy & paste the following as bindingsFile:"); - EncodeJournal.exportJournal(server.getConfiguration().getBindingsLocation().getAbsolutePath(), "activemq-bindings", "bindings", 2, 1048576, System.out); + EncodeJournal.exportJournal(server.getConfiguration().getBindingsLocation().getAbsolutePath(), "artemis-bindings", "bindings", 2, 1048576, System.out); System.out.println(); System.out.println("copy & paste the following as dataFile:"); - EncodeJournal.exportJournal(server.getConfiguration().getJournalLocation().getAbsolutePath(), "activemq-data", "amq", 2, 102400, System.out); + EncodeJournal.exportJournal(server.getConfiguration().getJournalLocation().getAbsolutePath(), "artemis-data", "amq", 2, 102400, System.out); } @Test public void testConsumeFromFormat() throws Exception { ActiveMQServer server = createServer(true); - DecodeJournal.importJournal(server.getConfiguration().getJournalLocation().getAbsolutePath(), "activemq-data", "amq", 2, 102400, new StringReader(journalFile)); - DecodeJournal.importJournal(server.getConfiguration().getBindingsLocation().getAbsolutePath(), "activemq-bindings", "bindings", 2, 1048576, new StringReader(bindingsFile)); + DecodeJournal.importJournal(server.getConfiguration().getJournalLocation().getAbsolutePath(), "artemis-data", "amq", 2, 102400, new StringReader(journalFile)); + DecodeJournal.importJournal(server.getConfiguration().getBindingsLocation().getAbsolutePath(), "artemis-bindings", "bindings", 2, 1048576, new StringReader(bindingsFile)); server.start(); ServerLocator locator = createInVMNonHALocator(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java index 2b1b62d83ff..e969b2c9374 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationFlowControlTest.java @@ -180,7 +180,7 @@ public void testReplicationIfFlowControlled() throws Exception { fileFactory = new MappedSequentialFileFactory(primaryConfiguration.getJournalLocation(), primaryConfiguration.getJournalFileSize(), false, primaryConfiguration.getJournalBufferSize_NIO(), primaryConfiguration.getJournalBufferTimeout_NIO(), null); - JournalImpl primaryMessageJournal = new JournalImpl(primaryConfiguration.getJournalFileSize(), primaryConfiguration.getJournalMinFiles(), primaryConfiguration.getJournalPoolFiles(), primaryConfiguration.getJournalCompactMinFiles(), primaryConfiguration.getJournalCompactPercentage(), fileFactory, "activemq-data", "amq", fileFactory.getMaxIO()); + JournalImpl primaryMessageJournal = new JournalImpl(primaryConfiguration.getJournalFileSize(), primaryConfiguration.getJournalMinFiles(), primaryConfiguration.getJournalPoolFiles(), primaryConfiguration.getJournalCompactMinFiles(), primaryConfiguration.getJournalCompactPercentage(), fileFactory, "artemis-data", "amq", fileFactory.getMaxIO()); primaryMessageJournal.start(); final AtomicInteger primaryJournalCounter = new AtomicInteger(); @@ -199,7 +199,7 @@ public void addRecord(RecordInfo info) { File backupJournalDir = brokersFolder.toPath().resolve("backup").resolve("data").resolve("journal").toFile(); fileFactory = new MappedSequentialFileFactory(backupConfiguration.getJournalLocation(), backupConfiguration.getJournalFileSize(), false, backupConfiguration.getJournalBufferSize_NIO(), backupConfiguration.getJournalBufferTimeout_NIO(), null); - JournalImpl backupMessageJournal = new JournalImpl(backupConfiguration.getJournalFileSize(), backupConfiguration.getJournalMinFiles(), backupConfiguration.getJournalPoolFiles(), backupConfiguration.getJournalCompactMinFiles(), backupConfiguration.getJournalCompactPercentage(), fileFactory, "activemq-data", "amq", fileFactory.getMaxIO()); + JournalImpl backupMessageJournal = new JournalImpl(backupConfiguration.getJournalFileSize(), backupConfiguration.getJournalMinFiles(), backupConfiguration.getJournalPoolFiles(), backupConfiguration.getJournalCompactMinFiles(), backupConfiguration.getJournalCompactPercentage(), fileFactory, "artemis-data", "amq", fileFactory.getMaxIO()); backupMessageJournal.start(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationTest.java index 26e0190b2d2..f56a00bfc63 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/SharedNothingReplicationTest.java @@ -199,7 +199,7 @@ public void nodeDown(long eventUID, String nodeID) { File primaryJournalDir = brokersFolder.toPath().resolve("live").resolve("data").resolve("journal").toFile(); fileFactory = new MappedSequentialFileFactory(primaryConfiguration.getJournalLocation(), primaryConfiguration.getJournalFileSize(), false, primaryConfiguration.getJournalBufferSize_NIO(), primaryConfiguration.getJournalBufferTimeout_NIO(), null); - JournalImpl primaryMessageJournal = new JournalImpl(primaryConfiguration.getJournalFileSize(), primaryConfiguration.getJournalMinFiles(), primaryConfiguration.getJournalPoolFiles(), primaryConfiguration.getJournalCompactMinFiles(), primaryConfiguration.getJournalCompactPercentage(), fileFactory, "activemq-data", "amq", fileFactory.getMaxIO()); + JournalImpl primaryMessageJournal = new JournalImpl(primaryConfiguration.getJournalFileSize(), primaryConfiguration.getJournalMinFiles(), primaryConfiguration.getJournalPoolFiles(), primaryConfiguration.getJournalCompactMinFiles(), primaryConfiguration.getJournalCompactPercentage(), fileFactory, "artemis-data", "amq", fileFactory.getMaxIO()); primaryMessageJournal.start(); final AtomicInteger primaryJournalCounter = new AtomicInteger(); @@ -218,7 +218,7 @@ public void addRecord(RecordInfo info) { File backupJournalDir = brokersFolder.toPath().resolve("backup").resolve("data").resolve("journal").toFile(); fileFactory = new MappedSequentialFileFactory(backupConfiguration.getJournalLocation(), backupConfiguration.getJournalFileSize(), false, backupConfiguration.getJournalBufferSize_NIO(), backupConfiguration.getJournalBufferTimeout_NIO(), null); - JournalImpl backupMessageJournal = new JournalImpl(backupConfiguration.getJournalFileSize(), backupConfiguration.getJournalMinFiles(), backupConfiguration.getJournalPoolFiles(), backupConfiguration.getJournalCompactMinFiles(), backupConfiguration.getJournalCompactPercentage(), fileFactory, "activemq-data", "amq", fileFactory.getMaxIO()); + JournalImpl backupMessageJournal = new JournalImpl(backupConfiguration.getJournalFileSize(), backupConfiguration.getJournalMinFiles(), backupConfiguration.getJournalPoolFiles(), backupConfiguration.getJournalCompactMinFiles(), backupConfiguration.getJournalCompactPercentage(), fileFactory, "artemis-data", "amq", fileFactory.getMaxIO()); backupMessageJournal.start(); diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java index 7031497bde8..6ebd4dd83cd 100644 --- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/journal/JournalImplTestUnit.java @@ -292,7 +292,7 @@ public void testSpeedNonTransactional() throws Exception { @Test public void testSpeedTransactional() throws Exception { - Journal journal = new JournalImpl(10 * 1024 * 1024, 10, 10, 0, 0, getFileFactory(), "activemq-data", "amq", 5000); + Journal journal = new JournalImpl(10 * 1024 * 1024, 10, 10, 0, 0, getFileFactory(), "artemis-data", "amq", 5000); journal.start(); @@ -347,7 +347,7 @@ private void internaltestSpeedNonTransactional() throws Exception { JournalImplTestUnit.logger.debug("num Files={}", numFiles); - Journal journal = new JournalImpl(10 * 1024 * 1024, numFiles, numFiles, 0, 0, getFileFactory(), "activemq-data", "amq", 5000); + Journal journal = new JournalImpl(10 * 1024 * 1024, numFiles, numFiles, 0, 0, getFileFactory(), "artemis-data", "amq", 5000); journal.start(); @@ -370,7 +370,7 @@ private void internaltestSpeedNonTransactional() throws Exception { journal.stop(); - journal = new JournalImpl(10 * 1024 * 1024, numFiles, numFiles, 0, 0, getFileFactory(), "activemq-data", "amq", 5000); + journal = new JournalImpl(10 * 1024 * 1024, numFiles, numFiles, 0, 0, getFileFactory(), "artemis-data", "amq", 5000); journal.start(); journal.load(new ArrayList<>(), null, null); diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java index 404c3ea9c7c..c13c737cddf 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/JournalCleanupCompactStressTest.java @@ -114,7 +114,7 @@ public void setUp() throws Exception { maxAIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(); } - journal = new JournalImpl(50 * 1024, 20, 20, 50, ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), factory, "activemq-data", "amq", maxAIO) { + journal = new JournalImpl(50 * 1024, 20, 20, 50, ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), factory, "artemis-data", "amq", maxAIO) { @Override protected void onCompactLockingTheJournal() throws Exception { } diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java index 665c6abd6f9..ef1d172b502 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/journal/NIOMultiThreadCompactorStressTest.java @@ -85,7 +85,7 @@ public void testMultiThreadCompact() throws Throwable { stopServer(); NIOSequentialFileFactory factory = new NIOSequentialFileFactory(new File(getJournalDir()), 1); - JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), 2, 2, 0, 0, factory, "activemq-data", "amq", 100); + JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), 2, 2, 0, 0, factory, "artemis-data", "amq", 100); List committedRecords = new ArrayList<>(); List preparedTransactions = new ArrayList<>(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java index c889c46075d..838fec454d2 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java @@ -44,7 +44,7 @@ public class BatchIDGeneratorUnitTest extends ActiveMQTestBase { @Test public void testSequence() throws Exception { NIOSequentialFileFactory factory = new NIOSequentialFileFactory(new File(getTestDir()), 1); - Journal journal = new JournalImpl(10 * 1024, 2, 2, 0, 0, factory, "activemq-bindings", "bindings", 1); + Journal journal = new JournalImpl(10 * 1024, 2, 2, 0, 0, factory, "artemis-bindings", "bindings", 1); journal.start(); From 29e64879c486cace95baf9fa712cdbac7e9efcf3 Mon Sep 17 00:00:00 2001 From: gchuf Date: Tue, 27 Jan 2026 15:26:45 +0100 Subject: [PATCH 2/2] ARTEMIS-5859 Always use uppercase in upgrade logs --- .../org/apache/activemq/artemis/cli/commands/Upgrade.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java index c69eeed32a4..515b1163248 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Upgrade.java @@ -466,10 +466,10 @@ private void removeWars(ActionContext context, File bootstrapXml) throws Excepti while (linesIterator.hasNext()) { String line = linesIterator.next(); if (line.matches("^(.*)