This is an automated email from the ASF dual-hosted git repository. msingh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 6c450910d76c9982ee0fa05ab5f07c7a18d1414b Author: Sammi Chen <[email protected]> AuthorDate: Tue Mar 16 17:07:18 2021 +0800 HDDS-4975. Refine missing delete block failure log (#2039) --- .../statemachine/background/BlockDeletingService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java index 1fedbb6..74e8c9b 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java @@ -317,6 +317,12 @@ public class BlockDeletingService extends BackgroundService { for (Table.KeyValue<String, BlockData> entry: toDeleteBlocks) { String blockName = entry.getKey(); LOG.debug("Deleting block {}", blockName); + if (entry.getValue() == null) { + LOG.warn("Missing delete block(Container = " + + container.getContainerData().getContainerID() + ", Block = " + + blockName); + continue; + } try { handler.deleteBlock(container, entry.getValue()); succeedBlocks.add(blockName); @@ -441,6 +447,12 @@ public class BlockDeletingService extends BackgroundService { String blk = blkLong.toString(); BlockData blkInfo = blockDataTable.get(blk); LOG.debug("Deleting block {}", blk); + if (blkInfo == null) { + LOG.warn("Missing delete block(Container = " + + container.getContainerData().getContainerID() + ", Block = " + + blk); + continue; + } try { handler.deleteBlock(container, blkInfo); } catch (InvalidProtocolBufferException e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
