Improve ByteBufMapper.objectToBytes() contract

[controller.git] / atomix-storage / src / main / java / io / atomix / storage / journal / JournalSegmentWriter.java

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java
index 33f596f496604b90a4f88c7f93c803ff097d1452..9c3da7a42e9e049089f98d3d9e1e8517fbed7bdf 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java
@@ -21,6 +21,7 @@ import static java.util.Objects.requireNonNull;
 import io.atomix.storage.journal.StorageException.TooLarge;
 import io.atomix.storage.journal.index.JournalIndex;
 import io.netty.buffer.Unpooled;
+import java.io.EOFException;
 import java.io.IOException;
 import java.nio.MappedByteBuffer;
 import org.eclipse.jdt.annotation.NonNull;
@@ -99,7 +100,7 @@ final class JournalSegmentWriter {
         final var bytes = Unpooled.wrappedBuffer(diskEntry.position(HEADER_BYTES));
         try {
             mapper.objectToBytes(entry, bytes);
-        } catch (IOException e) {
+        } catch (EOFException e) {
             // We ran out of buffer space: let's decide who's fault it is:
             if (writeLimit == maxEntrySize) {
                 // - it is the entry and/or mapper. This is not exactly accurate, as there may be other serialization
@@ -110,6 +111,8 @@ final class JournalSegmentWriter {
             // - it is us, as we do not have the capacity to hold maxEntrySize bytes
             LOG.trace("Tail serialization with {} bytes available failed", writeLimit, e);
             return null;
+        } catch (IOException e) {
+            throw new StorageException(e);
         }
 
         // Determine length, trim distEntry and compute checksum. We are okay with computeChecksum() consuming