Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support sync=true in JDBCJournal append record

This commit is contained in:
Martyn Taylor 2016-02-04 14:44:26 +00:00
parent 5eecd87106
commit 0e4a164b39
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
View File

@ -42,13 +42,14 @@ import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
import org.apache.activemq.artemis.core.journal.RecordInfo; import org.apache.activemq.artemis.core.journal.RecordInfo;
import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
import org.apache.activemq.artemis.core.journal.impl.JournalFile; import org.apache.activemq.artemis.core.journal.impl.JournalFile;
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
import org.apache.activemq.artemis.jdbc.store.JDBCUtils; import org.apache.activemq.artemis.jdbc.store.JDBCUtils;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
public class JDBCJournalImpl implements Journal { public class JDBCJournalImpl implements Journal {
// Sync Delay in ms // Sync Delay in ms
public static final int SYNC_DELAY = 500; public static final int SYNC_DELAY = 5;
private static int USER_VERSION = 1; private static int USER_VERSION = 1;
@ -285,7 +286,14 @@ public class JDBCJournalImpl implements Journal {
t.start(); t.start();
} }
private synchronized void appendRecord(JDBCJournalRecord record) { private void appendRecord(JDBCJournalRecord record) throws Exception {
SimpleWaitIOCallback callback = null;
if (record.isSync() && record.getIoCompletion() == null) {
callback = new SimpleWaitIOCallback();
record.setIoCompletion(callback);
}
try { try {
journalLock.writeLock().lock(); journalLock.writeLock().lock();
if (record.isTransactional() || record.getRecordType() == JDBCJournalRecord.PREPARE_RECORD) { if (record.isTransactional() || record.getRecordType() == JDBCJournalRecord.PREPARE_RECORD) {
@ -296,6 +304,8 @@ public class JDBCJournalImpl implements Journal {
finally { finally {
journalLock.writeLock().unlock(); journalLock.writeLock().unlock();
} }
if (callback != null) callback.waitCompletion();
} }
private void addTxRecord(JDBCJournalRecord record) { private void addTxRecord(JDBCJournalRecord record) {