From 9cef39f1fbed1e8315e9fefefda37d452a73ae9c Mon Sep 17 00:00:00 2001 From: AARON0607 Date: Mon, 6 Mar 2023 13:54:18 +0800 Subject: [PATCH 1/3] HDDS-8010. Improve DN warning message when getBlock does not find the block --- .../ozone/container/common/helpers/ContainerUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java index 11f54be8b93b..a66c55adbf31 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java @@ -79,16 +79,18 @@ private ContainerUtils() { public static ContainerCommandResponseProto logAndReturnError( Logger log, StorageContainerException ex, ContainerCommandRequestProto request) { - String logInfo = "Operation: {} , Trace ID: {} , Message: {} , " + - "Result: {} , StorageContainerException Occurred."; + String logInfo = "Operation: {} , Trace ID: {} , Block ID: {} , " + + "Message: {} ,Result: {} , StorageContainerException Occurred."; if (ex.getResult() == CLOSED_CONTAINER_IO || ex.getResult() == CONTAINER_NOT_OPEN) { if (log.isDebugEnabled()) { log.debug(logInfo, request.getCmdType(), request.getTraceID(), + request.getGetBlock().getBlockID(), ex.getMessage(), ex.getResult().getValueDescriptor().getName(), ex); } } else { - log.info(logInfo, request.getCmdType(), request.getTraceID(), + log.warn(logInfo, request.getCmdType(), request.getTraceID(), + request.getGetBlock().getBlockID(), ex.getMessage(), ex.getResult().getValueDescriptor().getName(), ex); } return getContainerCommandResponse(request, ex.getResult(), ex.getMessage()) From 13fbec5b9e5487f510a7a6ddc714c405de89e24e Mon Sep 17 00:00:00 2001 From: AARON0607 Date: Thu, 4 May 2023 18:42:52 +0800 Subject: [PATCH 2/3] HDDS-8010.Improve DN warning message when getBlock does not find the block --- .../container/common/helpers/StorageContainerException.java | 2 +- .../hadoop/ozone/container/common/helpers/ContainerUtils.java | 4 +--- .../ozone/container/keyvalue/impl/BlockManagerImpl.java | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java index f2271be3bcb3..65808d50034c 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hdds.scm.container.common.helpers; +import org.apache.hadoop.hdds.client.BlockID; import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; import java.io.IOException; @@ -100,5 +101,4 @@ public ContainerProtos.Result getResult() { return result; } - } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java index 94d73cd7f6b6..d6a08c3b6ab0 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java @@ -79,18 +79,16 @@ private ContainerUtils() { public static ContainerCommandResponseProto logAndReturnError( Logger log, StorageContainerException ex, ContainerCommandRequestProto request) { - String logInfo = "Operation: {} , Trace ID: {} , Block ID: {} , " + + String logInfo = "Operation: {} , Trace ID: {} , " + "Message: {} ,Result: {} , StorageContainerException Occurred."; if (ex.getResult() == CLOSED_CONTAINER_IO || ex.getResult() == CONTAINER_NOT_OPEN) { if (log.isDebugEnabled()) { log.debug(logInfo, request.getCmdType(), request.getTraceID(), - request.getGetBlock().getBlockID(), ex.getMessage(), ex.getResult().getValueDescriptor().getName(), ex); } } else { log.warn(logInfo, request.getCmdType(), request.getTraceID(), - request.getGetBlock().getBlockID(), ex.getMessage(), ex.getResult().getValueDescriptor().getName(), ex); } return getContainerCommandResponse(request, ex.getResult(), ex.getMessage()) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java index d274f0361fb4..44896dd0b17c 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java @@ -356,8 +356,9 @@ private BlockData getBlockByID(DBHandle db, BlockID blockID, BlockData blockData = db.getStore().getBlockDataTable().get(blockKey); if (blockData == null) { - throw new StorageContainerException(NO_SUCH_BLOCK_ERR_MSG, + throw new StorageContainerException(NO_SUCH_BLOCK_ERR_MSG + " BlockID : " + blockID.getLocalID() , NO_SUCH_BLOCK); + } return blockData; From 6681461ed005bab79c448aa741f74f48c3f33897 Mon Sep 17 00:00:00 2001 From: AARON0607 Date: Thu, 11 May 2023 15:01:03 +0800 Subject: [PATCH 3/3] HDDS-8010.Improve DN warning message when getBlock does not find the block. --- .../container/common/helpers/StorageContainerException.java | 1 - .../ozone/container/common/helpers/ContainerUtils.java | 4 ++-- .../ozone/container/keyvalue/impl/BlockManagerImpl.java | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java index 65808d50034c..7bc87b6c6647 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/StorageContainerException.java @@ -17,7 +17,6 @@ */ package org.apache.hadoop.hdds.scm.container.common.helpers; -import org.apache.hadoop.hdds.client.BlockID; import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos; import java.io.IOException; diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java index d6a08c3b6ab0..45a38c1618b4 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java @@ -79,8 +79,8 @@ private ContainerUtils() { public static ContainerCommandResponseProto logAndReturnError( Logger log, StorageContainerException ex, ContainerCommandRequestProto request) { - String logInfo = "Operation: {} , Trace ID: {} , " + - "Message: {} ,Result: {} , StorageContainerException Occurred."; + String logInfo = "Operation: {} , Trace ID: {} , Message: {} , " + + "Result: {} , StorageContainerException Occurred."; if (ex.getResult() == CLOSED_CONTAINER_IO || ex.getResult() == CONTAINER_NOT_OPEN) { if (log.isDebugEnabled()) { diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java index 44896dd0b17c..f2c126451c62 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java @@ -356,9 +356,8 @@ private BlockData getBlockByID(DBHandle db, BlockID blockID, BlockData blockData = db.getStore().getBlockDataTable().get(blockKey); if (blockData == null) { - throw new StorageContainerException(NO_SUCH_BLOCK_ERR_MSG + " BlockID : " + blockID.getLocalID() , - NO_SUCH_BLOCK); - + throw new StorageContainerException(NO_SUCH_BLOCK_ERR_MSG + + " BlockID : " + blockID, NO_SUCH_BLOCK); } return blockData;