This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch activemq-6.1.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-6.1.x by this push:
new 5819a9e160 Replace use of deprecated setEnableJournalDiskSyncs(boolean)
5819a9e160 is described below
commit 5819a9e160ccaef238a76cbf1708c757df54293a
Author: Alexej Timonin <[email protected]>
AuthorDate: Tue Jul 23 22:52:37 2024 +0200
Replace use of deprecated setEnableJournalDiskSyncs(boolean)
(cherry picked from commit e44efe0ce23e5cd63b11f9821868a383667da637)
---
.../src/test/java/org/apache/activemq/bugs/AMQ2512Test.java | 3 ++-
.../src/test/java/org/apache/activemq/bugs/AMQ2616Test.java | 3 ++-
.../java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java | 6 ++----
.../src/test/java/org/apache/activemq/perf/KahaDBQueueTest.java | 7 ++-----
.../org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java | 3 ++-
5 files changed, 10 insertions(+), 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
index ed0280c918..be00ef27a5 100644
---
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 jakarta.jms.TextMessage;
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 @@ public class AMQ2512Test {
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
index 28aaaffdd7..0826444ce5 100644
---
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.PolicyEntry;
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 class AMQ2616Test {
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
index 3d4f808614..27a8d3192e 100644
---
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 junit.framework.TestCase;
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 @@ public class VerifySteadyEnqueueRate extends TestCase {
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
index a11b92e3c0..75bfc10a73 100644
---
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 @@ package org.apache.activemq.perf;
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 @@ public class KahaDBQueueTest extends SimpleQueueTest {
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/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
index b640d8ac97..5965eff08c 100644
---
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
@@ -42,6 +42,7 @@ import org.apache.activemq.command.ActiveMQQueue;
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 class KahaDBFastEnqueueTest {
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
