fix: remove BlockRemover from BlockReader

Signed-off-by: Matt Peterson <[email protected]>
hashgraph · Aug 5, 2024 · 444a61c · 444a61c
1 parent d3b4978
commit 444a61c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/server/src/main/java/com/hedera/block/server/persistence/storage/BlockAsDirReader.java b/server/src/main/java/com/hedera/block/server/persistence/storage/BlockAsDirReader.java
@@ -39,12 +39,10 @@ public class BlockAsDirReader implements BlockReader<Block> {
 
     private final Path blockNodeRootPath;
     private final FileAttribute<Set<PosixFilePermission>> filePerms;
-    private final BlockRemover blockRemover;
 
     public BlockAsDirReader(
             final String key,
             final Config config,
-            final BlockRemover blockRemover,
             final FileAttribute<Set<PosixFilePermission>> filePerms) {
 
         LOGGER.log(System.Logger.Level.INFO, "Initializing FileSystemBlockReader");
@@ -55,16 +53,11 @@ public BlockAsDirReader(
         LOGGER.log(System.Logger.Level.INFO, "Block Node Root Path: " + blockNodeRootPath);
 
         this.blockNodeRootPath = blockNodeRootPath;
-        this.blockRemover = blockRemover;
         this.filePerms = filePerms;
     }
 
     public BlockAsDirReader(final String key, final Config config) {
-        this(
-                key,
-                config,
-                new BlockAsDirRemover(Path.of(config.get(key).asString().get()), Util.defaultPerms),
-                Util.defaultPerms);
+        this(key, config, Util.defaultPerms);
     }
 
     @Override
@@ -109,8 +102,6 @@ public Optional<Block> read(final long blockNumber) throws IOException {
             return Optional.of(builder.build());
         } catch (IOException io) {
             LOGGER.log(System.Logger.Level.ERROR, "Error reading block: " + blockPath, io);
-            LOGGER.log(System.Logger.Level.ERROR, "Attempting to remove the block: " + blockPath);
-            blockRemover.remove(blockNumber);
 
             throw io;
         }

diff --git a/server/src/test/java/com/hedera/block/server/persistence/storage/BlockAsDirReaderTest.java b/server/src/test/java/com/hedera/block/server/persistence/storage/BlockAsDirReaderTest.java
@@ -113,7 +113,7 @@ public void testRemoveBlockReadPermsRepairFailed() throws IOException {
                 new BlockAsDirRemover(
                         Path.of(testConfig.get(JUNIT).asString().get()), Util.defaultPerms);
         final BlockReader<Block> blockReader =
-                new BlockAsDirReader(JUNIT, testConfig, blockRemover, TestUtils.getNoPerms());
+                new BlockAsDirReader(JUNIT, testConfig, TestUtils.getNoPerms());
         final Optional<Block> blockOpt = blockReader.read(1);
         assertTrue(blockOpt.isEmpty());
     }