Replace use of deprecated setEnableJournalDiskSyncs(boolean)

(cherry picked from commit e44efe0)
apache · Dec 19, 2024 · 5819a9e · 5819a9e
1 parent 15106cb
commit 5819a9e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2512Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2512Test.java
@@ -38,6 +38,7 @@
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.apache.activemq.store.kahadb.disk.journal.Journal.JournalDiskSyncStrategy;
 import org.apache.activemq.util.IOHelper;
 import org.junit.After;
 import org.junit.Before;
@@ -185,7 +186,7 @@ protected BrokerService createBroker() throws Exception {
 
         KahaDBStore kaha = new KahaDBStore();
         kaha.setDirectory(dataFileDir);
-        kaha.setEnableJournalDiskSyncs(false);
+        kaha.setJournalDiskSyncStrategy(JournalDiskSyncStrategy.NEVER.name());
 
         BrokerService answer = new BrokerService();
         answer.setPersistenceAdapter(kaha);

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2616Test.java
@@ -34,6 +34,7 @@
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.store.kahadb.disk.journal.Journal.JournalDiskSyncStrategy;
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.Wait;
 import org.junit.After;
@@ -92,7 +93,7 @@ public void setUp() throws Exception {
         brokerService = new BrokerService();
 
         KahaDBPersistenceAdapter adaptor = new KahaDBPersistenceAdapter();
-        adaptor.setEnableJournalDiskSyncs(false);
+        adaptor.setJournalDiskSyncStrategy(JournalDiskSyncStrategy.NEVER.name());
         File file = new File("target/AMQ2616Test");
         IOHelper.mkdirs(file);
         IOHelper.deleteChildren(file);

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java
@@ -20,6 +20,7 @@
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.apache.activemq.store.kahadb.disk.journal.Journal.JournalDiskSyncStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -132,10 +133,7 @@ private void startBroker() throws Exception {
 
         KahaDBStore kaha = new KahaDBStore();
         kaha.setDirectory(new File("target/activemq-data/kahadb"));
-        // The setEnableJournalDiskSyncs(false) setting is a little dangerous right now, as I have not verified
-        // what happens if the index is updated but a journal update is lost.
-        // Index is going to be in consistent, but can it be repaired?
-        kaha.setEnableJournalDiskSyncs(false);
+        kaha.setJournalDiskSyncStrategy(JournalDiskSyncStrategy.NEVER.name());
         // Using a bigger journal file size makes he take fewer spikes as it is not switching files as often.
         kaha.setJournalMaxFileLength(1024*1024*100);
 

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/perf/KahaDBQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/perf/KahaDBQueueTest.java
@@ -19,6 +19,7 @@
 import java.io.File;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.store.kahadb.disk.journal.Journal.JournalDiskSyncStrategy;
 
 /**
  * 
@@ -40,11 +41,7 @@ protected void configureBroker(BrokerService answer,String uri) throws Exception
         kaha.setDirectory(dataFileDir);
         kaha.setDirectoryArchive(archiveDir);
         kaha.setArchiveDataLogs(false);
-
-        // The setEnableJournalDiskSyncs(false) setting is a little dangerous right now, as I have not verified 
-        // what happens if the index is updated but a journal update is lost.
-        // Index is going to be in consistent, but can it be repaired?
-        kaha.setEnableJournalDiskSyncs(true);
+        kaha.setJournalDiskSyncStrategy(JournalDiskSyncStrategy.NEVER.name());
         // Using a bigger journal file size makes he take fewer spikes as it is not switching files as often.
         //kaha.setJournalMaxFileLength(1024*1024*100);
 

diff --git a/...vemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java b/...vemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
@@ -42,6 +42,7 @@
 import org.apache.activemq.command.ConnectionControl;
 import org.apache.activemq.store.kahadb.disk.journal.FileAppender;
 import org.apache.activemq.store.kahadb.disk.journal.Journal;
+import org.apache.activemq.store.kahadb.disk.journal.Journal.JournalDiskSyncStrategy;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -213,7 +214,7 @@ public void startBroker(boolean deleteAllMessages, int checkPointPeriod) throws
         broker = new BrokerService();
         broker.setDeleteAllMessagesOnStartup(deleteAllMessages);
         kahaDBPersistenceAdapter = (KahaDBPersistenceAdapter)broker.getPersistenceAdapter();
-        kahaDBPersistenceAdapter.setEnableJournalDiskSyncs(false);
+        kahaDBPersistenceAdapter.setJournalDiskSyncStrategy(JournalDiskSyncStrategy.NEVER.name());
         // defer checkpoints which require a sync
         kahaDBPersistenceAdapter.setCleanupInterval(checkPointPeriod);
         kahaDBPersistenceAdapter.setCheckpointInterval(checkPointPeriod);