From ab78e1fb59b30ce8bc525f51d1137f6c16457973 Mon Sep 17 00:00:00 2001 From: AARON0607 Date: Thu, 2 Mar 2023 17:32:05 +0800 Subject: [PATCH 1/4] HDDS-8010 Improve DN warning message when getBlock does not find the block --- .../ozone/container/common/helpers/ContainerUtils.java | 6 +++--- 1 file changed, 3 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..72ff0706aceb 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,16 @@ private ContainerUtils() { public static ContainerCommandResponseProto logAndReturnError( Logger log, StorageContainerException ex, ContainerCommandRequestProto request) { - String logInfo = "Operation: {} , Trace ID: {} , Message: {} , " + + 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(), + log.warn(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 9928001a60122d2a78eb360d3d01c85e51998429 Mon Sep 17 00:00:00 2001 From: GAOJHIHCYUAN Date: Mon, 6 Mar 2023 00:42:51 +0800 Subject: [PATCH 2/4] HDDS-8010.Improve DN warning message when getBlock does not find the block --- .../ozone/container/common/helpers/ContainerUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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..e851575f8e33 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(), + log.warn(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 21fd4ec702b7bf67375345eda3eb18bddb55e4e0 Mon Sep 17 00:00:00 2001 From: AARON0607 Date: Mon, 6 Mar 2023 13:56:50 +0800 Subject: [PATCH 3/4] HDDS-8010. Improve DN warning message when getBlock does not find the block --- .../hadoop/ozone/container/common/helpers/ContainerUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 72ff0706aceb..0194304c71d9 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 @@ -84,7 +84,7 @@ public static ContainerCommandResponseProto logAndReturnError( if (ex.getResult() == CLOSED_CONTAINER_IO || ex.getResult() == CONTAINER_NOT_OPEN) { if (log.isDebugEnabled()) { - log.warn(logInfo, request.getCmdType(), request.getTraceID(),request.getGetBlock().getBlockID(), + log.debug(logInfo, request.getCmdType(), request.getTraceID(),request.getGetBlock().getBlockID(), ex.getMessage(), ex.getResult().getValueDescriptor().getName(), ex); } } else { From 9c124b77eda1df3cf0bed3e8d58e098d887766b5 Mon Sep 17 00:00:00 2001 From: AARON0607 Date: Mon, 6 Mar 2023 14:03:46 +0800 Subject: [PATCH 4/4] HDDS-8010. Improve DN warning message when getBlock does not find the block --- .../ozone/container/common/helpers/ContainerUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 12bfa22b84a0..e05d994f455e 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.warn(logInfo, request.getCmdType(), request.getTraceID(), + request.getGetBlock().getBlockID(), ex.getMessage(), ex.getResult().getValueDescriptor().getName(), ex); } return getContainerCommandResponse(request, ex.getResult(), ex.getMessage())