fix: adjusted exception handling

Signed-off-by: Matt Peterson <[email protected]>
hashgraph · Nov 20, 2024 · 3b94ee7 · 3b94ee7
1 parent ff0f3f4
commit 3b94ee7
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 44 deletions.
diff --git a/server/src/main/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImpl.java b/server/src/main/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImpl.java
@@ -32,6 +32,7 @@
 import com.hedera.hapi.block.BlockItemUnparsed;
 import com.hedera.hapi.block.SubscribeStreamResponseUnparsed;
 import com.hedera.pbj.runtime.OneOf;
+import com.hedera.pbj.runtime.ParseException;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.util.List;
@@ -137,7 +138,7 @@ public void onEvent(ObjectEvent<SubscribeStreamResponseUnparsed> event, long l,
                 LOGGER.log(ERROR, "Service is not running. Block item will not be processed further.");
             }
 
-        } catch (BlockStreamProtocolException | IOException e) {
+        } catch (BlockStreamProtocolException | IOException | ParseException e) {
 
             metricsService.get(StreamPersistenceHandlerError).increment();
 

diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriter.java
@@ -116,47 +116,42 @@ class BlockAsDirWriter implements BlockWriter<List<BlockItemUnparsed>> {
      */
     @Override
     public Optional<List<BlockItemUnparsed>> write(@NonNull final List<BlockItemUnparsed> blockItems)
-            throws IOException {
+            throws IOException, ParseException {
 
-        try {
-            final Bytes unparsedBlockHeader = blockItems.getFirst().blockHeader();
-            if (unparsedBlockHeader != null) {
-                resetState(BlockHeader.PROTOBUF.parse(unparsedBlockHeader));
-            }
+        final Bytes unparsedBlockHeader = blockItems.getFirst().blockHeader();
+        if (unparsedBlockHeader != null) {
+            resetState(BlockHeader.PROTOBUF.parse(unparsedBlockHeader));
+        }
 
-            for (BlockItemUnparsed blockItemUnparsed : blockItems) {
-                final Path blockItemFilePath = calculateBlockItemPath();
-                for (int retries = 0; ; retries++) {
-                    try {
-                        write(blockItemFilePath, blockItemUnparsed);
-                        break;
-                    } catch (IOException e) {
-
-                        LOGGER.log(ERROR, "Error writing the BlockItem protobuf to a file: ", e);
-
-                        // Remove the block if repairing the permissions fails
-                        if (retries > 0) {
-                            // Attempt to remove the block
-                            blockRemover.remove(Long.parseLong(currentBlockDir.toString()));
-                            throw e;
-                        } else {
-                            // Attempt to repair the permissions on the block path
-                            // and the blockItem path
-                            repairPermissions(blockNodeRootPath);
-                            repairPermissions(calculateBlockPath());
-                            LOGGER.log(INFO, "Retrying to write the BlockItem protobuf to a file");
-                        }
+        for (BlockItemUnparsed blockItemUnparsed : blockItems) {
+            final Path blockItemFilePath = calculateBlockItemPath();
+            for (int retries = 0; ; retries++) {
+                try {
+                    write(blockItemFilePath, blockItemUnparsed);
+                    break;
+                } catch (IOException e) {
+
+                    LOGGER.log(ERROR, "Error writing the BlockItem protobuf to a file: ", e);
+
+                    // Remove the block if repairing the permissions fails
+                    if (retries > 0) {
+                        // Attempt to remove the block
+                        blockRemover.remove(Long.parseLong(currentBlockDir.toString()));
+                        throw e;
+                    } else {
+                        // Attempt to repair the permissions on the block path
+                        // and the blockItem path
+                        repairPermissions(blockNodeRootPath);
+                        repairPermissions(calculateBlockPath());
+                        LOGGER.log(INFO, "Retrying to write the BlockItem protobuf to a file");
                     }
                 }
             }
+        }
 
-            if (blockItems.getLast().hasBlockProof()) {
-                metricsService.get(BlocksPersisted).increment();
-                return Optional.of(blockItems);
-            }
-        } catch (ParseException p) {
-            LOGGER.log(ERROR, "Error parsing BlockHeader: ", p);
-            throw new IOException(p);
+        if (blockItems.getLast().hasBlockProof()) {
+            metricsService.get(BlocksPersisted).increment();
+            return Optional.of(blockItems);
         }
 
         return Optional.empty();

diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockWriter.java b/server/src/main/java/com/hedera/block/server/persistence/storage/write/BlockWriter.java
@@ -16,6 +16,7 @@
 
 package com.hedera.block.server.persistence.storage.write;
 
+import com.hedera.pbj.runtime.ParseException;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
 import java.util.Optional;
@@ -35,5 +36,5 @@ public interface BlockWriter<V> {
      *     block proof signaling the end of the block, an empty optional otherwise.
      * @throws IOException when failing to write the block item to storage.
      */
-    Optional<V> write(@NonNull final V blockItem) throws IOException;
+    Optional<V> write(@NonNull final V blockItem) throws IOException, ParseException;
 }
diff --git a/server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java b/server/src/test/java/com/hedera/block/server/mediator/LiveStreamMediatorImplTest.java
@@ -44,6 +44,7 @@
 import com.hedera.hapi.block.SubscribeStreamResponseCode;
 import com.hedera.hapi.block.SubscribeStreamResponseUnparsed;
 import com.hedera.hapi.block.stream.output.BlockHeader;
+import com.hedera.pbj.runtime.ParseException;
 import com.hedera.pbj.runtime.grpc.Pipeline;
 import com.swirlds.metrics.api.LongGauge;
 import java.io.IOException;
@@ -135,7 +136,7 @@ public void testUnsubscribeEach() throws InterruptedException, IOException {
     }
 
     @Test
-    public void testMediatorPersistenceWithoutSubscribers() throws IOException {
+    public void testMediatorPersistenceWithoutSubscribers() throws IOException, ParseException {
 
         final BlockNodeContext blockNodeContext = TestConfigUtil.getTestBlockNodeContext();
         final ServiceStatus serviceStatus = new ServiceStatusImpl(blockNodeContext);
@@ -162,7 +163,7 @@ public void testMediatorPersistenceWithoutSubscribers() throws IOException {
     }
 
     @Test
-    public void testMediatorPublishEventToSubscribers() throws IOException {
+    public void testMediatorPublishEventToSubscribers() throws IOException, ParseException {
 
         final BlockNodeContext blockNodeContext = TestConfigUtil.getTestBlockNodeContext();
         final ServiceStatus serviceStatus = new ServiceStatusImpl(blockNodeContext);
@@ -384,7 +385,7 @@ public void testSubscribeWhenHandlerAlreadySubscribed() throws IOException {
     //    }
 
     @Test
-    public void testMediatorBlocksPublishAfterException() throws IOException, InterruptedException {
+    public void testMediatorBlocksPublishAfterException() throws IOException, InterruptedException, ParseException {
 
         final BlockNodeContext blockNodeContext = TestConfigUtil.getTestBlockNodeContext();
         final ServiceStatus serviceStatus = new ServiceStatusImpl(blockNodeContext);

diff --git a/server/src/test/java/com/hedera/block/server/pbj/PbjBlockStreamServiceIntegrationTest.java b/server/src/test/java/com/hedera/block/server/pbj/PbjBlockStreamServiceIntegrationTest.java
@@ -59,6 +59,7 @@
 import com.hedera.hapi.block.SubscribeStreamRequest;
 import com.hedera.hapi.block.SubscribeStreamResponseCode;
 import com.hedera.hapi.block.SubscribeStreamResponseUnparsed;
+import com.hedera.pbj.runtime.ParseException;
 import com.hedera.pbj.runtime.grpc.Pipeline;
 import com.hedera.pbj.runtime.grpc.ServiceInterface;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
@@ -153,7 +154,7 @@ public void tearDown() {
     }
 
     @Test
-    public void testPublishBlockStreamRegistrationAndExecution() throws IOException, NoSuchAlgorithmException {
+    public void testPublishBlockStreamRegistrationAndExecution() throws IOException, NoSuchAlgorithmException, ParseException {
 
         final PbjBlockStreamServiceProxy pbjBlockStreamServiceProxy = buildBlockStreamService(blockWriter);
 
@@ -497,7 +498,7 @@ public void testSubAndUnsubWhileStreaming() throws InterruptedException {
     }
 
     @Test
-    public void testMediatorExceptionHandlingWhenPersistenceFailure() throws IOException {
+    public void testMediatorExceptionHandlingWhenPersistenceFailure() throws IOException, ParseException {
         final ConcurrentHashMap<
                         BlockNodeEventHandler<ObjectEvent<SubscribeStreamResponseUnparsed>>,
                         BatchEventProcessor<ObjectEvent<SubscribeStreamResponseUnparsed>>>

diff --git a/.../src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsDirReaderTest.java b/.../src/test/java/com/hedera/block/server/persistence/storage/read/BlockAsDirReaderTest.java
@@ -115,7 +115,7 @@ public void testRemoveBlockReadPermsRepairFailed() throws IOException, ParseExce
     }
 
     @Test
-    public void testRemoveBlockItemReadPerms() throws IOException {
+    public void testRemoveBlockItemReadPerms() throws IOException, ParseException {
         final BlockWriter<List<BlockItemUnparsed>> blockWriter =
                 BlockAsDirWriterBuilder.newBuilder(blockNodeContext).build();
         blockWriter.write(blockItems);

diff --git a/...src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriterTest.java b/...src/test/java/com/hedera/block/server/persistence/storage/write/BlockAsDirWriterTest.java
@@ -185,7 +185,7 @@ public void testRemoveBlockWritePerms() throws IOException, ParseException {
     }
 
     @Test
-    public void testUnrecoverableIOExceptionOnWrite() throws IOException {
+    public void testUnrecoverableIOExceptionOnWrite() throws IOException, ParseException {
 
         final BlockRemover blockRemover = new BlockAsDirRemover(Path.of(testConfig.rootPath()));
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         @Test
-        public void testUnrecoverableIOExceptionOnWrite() throws IOException {
+        public void testUnrecoverableIOExceptionOnWrite() throws IOException, ParseException {
             final BlockRemover blockRemover = new BlockAsDirRemover(Path.of(testConfig.rootPath()));
@@ Expand Down @@