ARTEMIS-5859 Rename bindings and journal files

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");
             }
 
@@ -463,10 +466,10 @@ private void removeWars(ActionContext context, File bootstrapXml) throws Excepti
          while (linesIterator.hasNext()) {
             String line = linesIterator.next();
             if (line.matches("^(.*)<app name=(.*branding.*)$")) {
-               context.out.println("removing branding war as no longer needed");
+               context.out.println("Removing branding war as no longer needed");
                remove = true;
             } else if (line.matches("^(.*)<app name=(.*plugin.*)$")) {
-               context.out.println("removing plugin war as no longer needed");
+               context.out.println("Removing plugin war as no longer needed");
                remove = true;
             } else {
                sb.append(line).append(System.lineSeparator());
@@ -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);
+         }
+      }
+
+   }
 }

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<JournalFile> files = messagesJournal.orderFiles();
 

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());
    }
 

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";

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";

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);
    }

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;

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<JournalFile> files = messagesJournal.orderFiles();
 

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)
 

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.
 

tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java

@@ -1731,7 +1731,7 @@ protected Pair<List<RecordInfo>, List<PreparedTransactionInfo>> 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<RecordInfo> committedRecords = new LinkedList<>();
          final List<PreparedTransactionInfo> preparedTransactions = new LinkedList<>();
 
@@ -1764,7 +1764,7 @@ protected HashMap<Integer, AtomicInteger> countJournal(File location, int journa
       final HashMap<Integer, AtomicInteger> 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<JournalFile> filesToRead = messagesJournal.orderFiles();
 
       for (JournalFile file : filesToRead) {
@@ -1777,7 +1777,7 @@ protected HashMap<Integer, AtomicInteger> countBindingJournal(Configuration conf
       final HashMap<Integer, AtomicInteger> 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<JournalFile> filesToRead = messagesJournal.orderFiles();
 
       for (JournalFile file : filesToRead) {
@@ -1807,10 +1807,10 @@ protected HashMap<Integer, AtomicInteger> 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();
 

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);

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,

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,