From 713bb4a8c05421d71ba86502f0edf486c38aded8 Mon Sep 17 00:00:00 2001 From: Shivam Kumar Date: Mon, 23 Oct 2023 23:36:09 +0530 Subject: [PATCH 1/4] HDDS-9462: DeleteBlocksCommandHandler should not print TXID at info level --- .../common/helpers/DeletedContainerBlocksSummary.java | 4 ++++ .../commandhandler/DeleteBlocksCommandHandler.java | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/DeletedContainerBlocksSummary.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/DeletedContainerBlocksSummary.java index 73023ca33ced..8fadcce82d45 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/DeletedContainerBlocksSummary.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/DeletedContainerBlocksSummary.java @@ -69,6 +69,10 @@ public static DeletedContainerBlocksSummary getFrom( return new DeletedContainerBlocksSummary(blocks); } + public int getNumOfTxs() { + return txSummary.size(); + } + public int getNumOfBlocks() { return numOfBlocks; } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java index f8943b62e408..25745981a127 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java @@ -326,9 +326,13 @@ private void processCmd(DeleteCmdInfo cmd) { DeletedContainerBlocksSummary summary = DeletedContainerBlocksSummary.getFrom(containerBlocks); - LOG.info("Start to delete container blocks, TXIDs={}, " + if (LOG.isDebugEnabled()) { + LOG.info("Start to delete container blocks, TXIDs={}", + summary.getTxIDSummary()); + } + LOG.info("Summary of deleting container blocks, numOfTransactions={}, " + "numOfContainers={}, numOfBlocks={}", - summary.getTxIDSummary(), + summary.getNumOfTxs(), summary.getNumOfContainers(), summary.getNumOfBlocks()); blockDeleteMetrics.incrReceivedContainerCount( From 47f472f866be980ae17ca68387da85a0771c03c0 Mon Sep 17 00:00:00 2001 From: Shivam Kumar Date: Mon, 23 Oct 2023 23:36:09 +0530 Subject: [PATCH 2/4] HDDS-9462: DeleteBlocksCommandHandler should not print TXID at info level --- .../commandhandler/DeleteBlocksCommandHandler.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java index 25745981a127..dd9c21e58e18 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java @@ -326,10 +326,8 @@ private void processCmd(DeleteCmdInfo cmd) { DeletedContainerBlocksSummary summary = DeletedContainerBlocksSummary.getFrom(containerBlocks); - if (LOG.isDebugEnabled()) { - LOG.info("Start to delete container blocks, TXIDs={}", - summary.getTxIDSummary()); - } + LOG.debug("Start to delete container blocks, TXIDs={}", + summary.getTxIDSummary()); LOG.info("Summary of deleting container blocks, numOfTransactions={}, " + "numOfContainers={}, numOfBlocks={}", summary.getNumOfTxs(), From 8e723961b4aad887ba5092895732bf8d53ccff3a Mon Sep 17 00:00:00 2001 From: Shivam Kumar Date: Mon, 23 Oct 2023 23:36:09 +0530 Subject: [PATCH 3/4] HDDS-9462: DeleteBlocksCommandHandler should not print TXID at info level --- .../commandhandler/DeleteBlocksCommandHandler.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/statemachine/commandhandler/DeleteBlocksCommandHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java index dd9c21e58e18..ae664bd22c91 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java @@ -326,13 +326,15 @@ private void processCmd(DeleteCmdInfo cmd) { DeletedContainerBlocksSummary summary = DeletedContainerBlocksSummary.getFrom(containerBlocks); - LOG.debug("Start to delete container blocks, TXIDs={}", - summary.getTxIDSummary()); LOG.info("Summary of deleting container blocks, numOfTransactions={}, " + "numOfContainers={}, numOfBlocks={}", summary.getNumOfTxs(), summary.getNumOfContainers(), summary.getNumOfBlocks()); + if (LOG.isDebugEnabled()) { + LOG.debug("Start to delete container blocks, TXIDs={}", + summary.getTxIDSummary()); + } blockDeleteMetrics.incrReceivedContainerCount( summary.getNumOfContainers()); blockDeleteMetrics.incrReceivedRetryTransactionCount( From 0e8c30117c8d22d8b62bb8d7cf3722efaa876031 Mon Sep 17 00:00:00 2001 From: Shivam Kumar Date: Thu, 26 Oct 2023 12:58:11 +0530 Subject: [PATCH 4/4] HDDS-9462. DeleteBlocksCommandHandler should not print TXID at info level --- .../statemachine/commandhandler/DeleteBlocksCommandHandler.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/statemachine/commandhandler/DeleteBlocksCommandHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java index ae664bd22c91..d29162dd887a 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java @@ -333,7 +333,7 @@ private void processCmd(DeleteCmdInfo cmd) { summary.getNumOfBlocks()); if (LOG.isDebugEnabled()) { LOG.debug("Start to delete container blocks, TXIDs={}", - summary.getTxIDSummary()); + summary.getTxIDSummary()); } blockDeleteMetrics.incrReceivedContainerCount( summary.getNumOfContainers());