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

ARTEMIS-2131 Error compacting journal 

Compaction cannot free a sliced view of a ByteBuffer on Java >=9:
the fix is using the original ByteBuffer instead of the slice
to perform a file write and allow it to be correctly released by
the Cleaner.
This commit is contained in:
Francesco Nigro 2018-10-17 15:10:04 +02:00 committed by Clebert Suconic
parent 48d8a54135
commit cae253d136
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java
View File

@ -56,6 +56,8 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
private ActiveMQBuffer writingChannel; private ActiveMQBuffer writingChannel;
private ByteBuffer bufferWrite;
private final ConcurrentLongHashSet recordsSnapshot; private final ConcurrentLongHashSet recordsSnapshot;
protected final List<JournalFile> newDataFiles = new ArrayList<>(); protected final List<JournalFile> newDataFiles = new ArrayList<>();
@ -214,11 +216,17 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
// To Fix the size of the file // To Fix the size of the file
writingChannel.writerIndex(writingChannel.capacity()); writingChannel.writerIndex(writingChannel.capacity());
sequentialFile.writeDirect(writingChannel.toByteBuffer(), true); bufferWrite.clear()
.position(writingChannel.readerIndex())
.limit(writingChannel.readableBytes());
sequentialFile.writeDirect(bufferWrite, true);
sequentialFile.close(); sequentialFile.close();
newDataFiles.add(currentFile); newDataFiles.add(currentFile);
} }
bufferWrite = null;
writingChannel = null; writingChannel = null;
} }
@ -237,7 +245,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
protected void openFile() throws Exception { protected void openFile() throws Exception {
flush(); flush();
ByteBuffer bufferWrite = fileFactory.newBuffer(journal.getFileSize()); bufferWrite = fileFactory.newBuffer(journal.getFileSize());
writingChannel = ActiveMQBuffers.wrappedBuffer(bufferWrite); writingChannel = ActiveMQBuffers.wrappedBuffer(bufferWrite);