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

ARTEMIS-4543 Reverting to previous semantic on MappedSequentialFile

This commit is contained in:
Clebert Suconic 2023-12-19 21:48:12 -05:00 committed by clebert
parent a1add09734
commit d8ac2d99e0
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/IOCallback.java
View File

@ -38,13 +38,15 @@ public interface IOCallback {
void onError(int errorCode, String errorMessage);
static void done(Collection<? extends IOCallback> delegates) {
delegates.forEach(callback -> {
try {
callback.done();
} catch (Throwable e) {
ActiveMQJournalLogger.LOGGER.errorCompletingCallback(e);
}
});
if (delegates != null) {
delegates.forEach(callback -> {
try {
callback.done();
} catch (Throwable e) {
ActiveMQJournalLogger.LOGGER.errorCompletingCallback(e);
}
});
}
}
static void onError(Collection<? extends IOCallback> delegates, int errorCode, final String errorMessage) {

23
artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/TimedSequentialFile.java
View File

@ -18,7 +18,6 @@ package org.apache.activemq.artemis.core.io.mapped;
import java.io.File;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.ByteBuffer;
import java.util.List;
@ -35,14 +34,9 @@ import org.apache.activemq.artemis.core.io.buffer.TimedBuffer;
import org.apache.activemq.artemis.core.io.buffer.TimedBufferObserver;
import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
final class TimedSequentialFile implements SequentialFile {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final SequentialFileFactory factory;
private final SequentialFile sequentialFile;
private final LocalBufferObserver observer;
@ -255,7 +249,7 @@ final class TimedSequentialFile implements SequentialFile {
@Override
public boolean supportSync() {
return true;
return false;
}
@Override
@ -277,7 +271,8 @@ final class TimedSequentialFile implements SequentialFile {
buffer.flip();
}
try {
blockingWriteDirect(buffer, false, releaseBuffer);
blockingWriteDirect(buffer, requestedSync, releaseBuffer);
IOCallback.done(callbacks);
} catch (Throwable t) {
final int code;
if (t instanceof IOException) {
@ -288,20 +283,14 @@ final class TimedSequentialFile implements SequentialFile {
}
IOCallback.onError(callbacks, code, t.getMessage());
}
} else {
IOCallback.done(callbacks);
}
}
@Override
public void checkSync(boolean syncRequested, List<IOCallback> callbacks) {
try {
sync();
} catch (Exception e) {
logger.warn(e.getMessage(), e);
} finally {
if (callbacks != null) {
callbacks.forEach(c -> c.done());
}
}
throw new UnsupportedOperationException("This method is not supported on mapped");
}
@Override

3
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/BatchCommitTest.java
View File

@ -46,6 +46,7 @@ import org.apache.activemq.artemis.utils.actors.OrderedExecutorFactory;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -172,7 +173,7 @@ public class BatchCommitTest extends ActiveMQTestBase {
internalTest(JournalType.NIO, "testRunNIO", false);
}
@Test
@Ignore // TODO: We should fix Mapped eventually for this case
public void testMapped() throws Exception {
internalTest(JournalType.MAPPED, "testRunMapped", true);
}