From d058d50b7f5dc07ebf26437ec5b14cb6e0f95a9b Mon Sep 17 00:00:00 2001
From: Siyao Meng <50227127+smengcl@users.noreply.github.com>
Date: Wed, 9 Aug 2023 22:12:34 -0700
Subject: [PATCH] Address
 https://github.com/apache/ozone/pull/5167/files#r1289538750

---
 .../ozone/om/request/key/OMKeyCommitRequest.java   | 14 +++++---------
 .../om/request/key/OMKeyCommitRequestWithFSO.java  | 14 +++++---------
 .../hadoop/ozone/om/request/key/OMKeyRequest.java  | 12 ++++--------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
index 574e38e7e38..07ea5aea5d3 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
@@ -151,10 +151,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
       omMetrics.incNumKeyCommits();
     }
 
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("isHSync = {}, volumeName = {}, bucketName = {}, keyName = {}",
-          isHSync, volumeName, bucketName, keyName);
-    }
+    LOG.debug("isHSync = {}, volumeName = {}, bucketName = {}, keyName = {}",
+        isHSync, volumeName, bucketName, keyName);
 
     try {
       commitKeyArgs = resolveBucketLink(ozoneManager, commitKeyArgs, auditMap);
@@ -324,11 +322,9 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
       processResult(commitKeyRequest, volumeName, bucketName, keyName,
           omMetrics, exception, omKeyInfo, result);
     } else {
-      // Debug logging for HSync
-      if (LOG.isDebugEnabled()) {
-        LOG.debug("Key successfully committed with isHSync = {}, " +
-            "omKeyInfo = {}", isHSync, omKeyInfo);
-      }
+      // Debug logging for HSync key commits
+      LOG.debug("Key successfully committed with isHSync = {}, " +
+          "omKeyInfo = {}", isHSync, omKeyInfo);
     }
 
     return omClientResponse;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
index eaaa443fcfc..88666ab7e9b 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequestWithFSO.java
@@ -108,10 +108,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
       omMetrics.incNumKeyCommits();
     }
 
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("isHSync = {}, volumeName = {}, bucketName = {}, keyName = {}",
-          isHSync, volumeName, bucketName, keyName);
-    }
+    LOG.debug("isHSync = {}, volumeName = {}, bucketName = {}, keyName = {}",
+        isHSync, volumeName, bucketName, keyName);
 
     OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
 
@@ -279,11 +277,9 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
       processResult(commitKeyRequest, volumeName, bucketName, keyName,
           omMetrics, exception, omKeyInfo, result);
     } else {
-      // Debug logging for HSync
-      if (LOG.isDebugEnabled()) {
-        LOG.debug("Key successfully committed with isHSync = {}, " +
-            "omKeyInfo = {}", isHSync, omKeyInfo);
-      }
+      // Debug logging for HSync key commits
+      LOG.debug("Key successfully committed with isHSync = {}, " +
+          "omKeyInfo = {}", isHSync, omKeyInfo);
     }
 
     return omClientResponse;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
index 9920d4da92e..236b1a303c8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -863,10 +863,8 @@ protected OmKeyInfo wrapUncommittedBlocksAsPseudoKey(
   protected void filterOutBlocksStillInUse(OmKeyInfo referenceKey,
                                            RepeatedOmKeyInfo keysToBeFiltered) {
 
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("Before block filtering, keysToBeFiltered = {}",
-          keysToBeFiltered);
-    }
+    LOG.debug("Before block filtering, keysToBeFiltered = {}",
+        keysToBeFiltered);
 
     // A HashSet for fast lookup. Gathers all ContainerBlockID entries inside
     // the referenceKey.
@@ -944,9 +942,7 @@ protected void filterOutBlocksStillInUse(OmKeyInfo referenceKey,
       }
     }
 
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("After block filtering,  keysToBeFiltered = {}",
-          keysToBeFiltered);
-    }
+    LOG.debug(" After block filtering, keysToBeFiltered = {}",
+        keysToBeFiltered);
   }
 }