cleanup & correct logging

Signed-off-by: Atanas Atanasov <[email protected]>

Author: ata-nas

server/src/main/java/com/hedera/block/server/ack/AckHandlerImpl.java

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.hedera.block.server.ack;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 import com.hedera.block.server.block.BlockInfo;
 import com.hedera.block.server.metrics.BlockNodeMetricTypes;
 import com.hedera.block.server.metrics.MetricsService;
@@ -110,8 +112,9 @@ public void blockVerificationFailed(long blockNumber) {
         notifier.sendEndOfStream(lastAcknowledgedBlockNumber, PublishStreamResponseCode.STREAM_ITEMS_BAD_STATE_PROOF);
         try {
             blockRemover.removeUnverified(blockNumber);
-        } catch (IOException e) {
-            LOGGER.log(System.Logger.Level.ERROR, "Failed to remove block " + blockNumber, e);
+        } catch (final IOException e) {
+            final String message = "Failed to remove Block with number [%d]".formatted(blockNumber);
+            LOGGER.log(ERROR, message, e);
             throw new RuntimeException(e);
         }
         blockInfo.remove(blockNumber);
@@ -161,6 +164,11 @@ private void attemptAcks() {
                     //   again. What would be the best way to hande inability to move the block with
                     //   the limitations we current have?
                     // @todo(774) we should use a response code for failed persistence here
+                    LOGGER.log(
+                            ERROR,
+                            "Failed to move Block with number [%d] from unverified to live storage"
+                                    .formatted(nextBlock),
+                            e);
                     blockVerificationFailed(nextBlock);
                     return;
                 }

server/src/main/java/com/hedera/block/server/persistence/StreamPersistenceHandlerImpl.java

@@ -146,6 +146,7 @@ public void moveVerified(final long blockNumber) throws IOException {
                     rawPathToLive, unverifiedBlockPath.compressionType().getFileExtension());
             Files.createDirectories(target.getParent());
             Files.move(source, target);
+            archiver.notifyBlockPersisted(blockNumber);
         } else {
             throw new FileNotFoundException(
                     "File for Block [%s] not found under unverified root".formatted(blockNumber));
@@ -209,7 +210,6 @@ private void handleBlockItems(final List<BlockItemUnparsed> blockItems)
                     final AsyncBlockWriter writer = asyncBlockWriterFactory.create(blockNumber);
                     currentWriterQueue = writer.getQueue();
                     completionService.submit(writer);
-                    archiver.notifyBlockPersisted(blockNumber);
                 } else {
                     // we need to notify the ackHandler that the block number is invalid
                     // IMPORTANT: the currentWriterQueue MUST be null after we have

server/src/main/java/com/hedera/block/server/persistence/storage/archive/LocalGroupZipArchiveTask.java

@@ -44,8 +44,6 @@ public final class LocalGroupZipArchiveTask implements Callable<Long> {
     private static final String ADD_ENTRY_MESSAGE = "Adding Zip Entry [{0}] to zip file [{1}]";
     private static final String ADD_SUCCESS_MESSAGE = "Zip Entry [{0}] successfully added to zip file [{1}]";
     private static final String ZIP_FILE_SUCCESSFULLY_CREATED_MESSAGE = "Zip File [{0}] successfully created";
-    private static final String MUST_CREATE_SYMLINK_MESSAGE =
-            "Unable to create hard link [{0} <-> {1}], attempting to create a symbolic link instead";
     private static final String LINK_CREATED_MESSAGE = "Link [{0} <-> {1}] created";
     private static final int BUFFER_SIZE = 32768; // 32K should exactly contain one or two disk blocks in most cases.
     private final BlockPathResolver pathResolver;
@@ -259,7 +257,10 @@ private void createLink(final Path rootToArchive, final Path zipFilePath) throws
         try {
             Files.createLink(livelink, zipFilePath);
         } catch (final IOException e) {
-            LOGGER.log(Level.DEBUG, MUST_CREATE_SYMLINK_MESSAGE, livelink, zipFilePath, e);
+            final String message =
+                    "Unable to create hard link [%s <-> %s], attempting to create a symbolic link instead"
+                            .formatted(livelink, zipFilePath);
+            LOGGER.log(Level.DEBUG, message, e);
             // If we are unable to create a link, we need to attempt to create a symbolic link.
             Files.createSymbolicLink(livelink, zipFilePath);
         }