From 91e99a2609e759fb3b3286955ff937ecb7c552e0 Mon Sep 17 00:00:00 2001 From: sky76093016 <6ssssssky6@gmail.com> Date: Mon, 28 Jun 2021 11:40:44 +0800 Subject: [PATCH 1/7] HDDS-5383. Eliminate expensive string creation in debug log messages --- .../hadoop/hdds/scm/storage/BlockOutputStream.java | 2 +- .../scm/update/client/CRLClientUpdateHandler.java | 2 +- .../authority/PKIProfiles/DefaultProfile.java | 2 +- .../hadoop/hdds/scm/update/server/MockCRLStore.java | 4 ++-- .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 2 +- .../org/apache/hadoop/ozone/om/TrashPolicyOzone.java | 12 ++++++------ .../s3/exception/BadRequestExceptionMapper.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java index e80c1a3da89b..566a209009d3 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java @@ -595,7 +595,7 @@ private void setIoException(Exception e) { IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e); ioException.compareAndSet(null, exception); } else { - LOG.debug("Previous request had already failed with " + ioe.toString() + LOG.debug("Previous request had already failed with " + ioe + " so subsequent request also encounters" + " Storage Container Exception ", e); } diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java index df219e03f5f8..6b39fd747f90 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/update/client/CRLClientUpdateHandler.java @@ -118,7 +118,7 @@ public void start() { .updateStatus(new StreamObserver() { @Override public void onNext(UpdateResponse updateResponse) { - LOG.debug("Receive server response: {}", updateResponse.toString()); + LOG.debug("Receive server response: {}", updateResponse); serviceGrpcClient.incrUpdateCount(); handleServerUpdate(updateResponse); } diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java index 7791fa9063fc..7833f6c1c7ad 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/PKIProfiles/DefaultProfile.java @@ -238,7 +238,7 @@ public boolean validateGeneralName(int type, String value) { final InetAddress byAddress = InetAddress.getByAddress( Hex.decodeHex(value.substring(1))); if (LOG.isDebugEnabled()) { - LOG.debug("Host Name/IP Address : {}", byAddress.toString()); + LOG.debug("Host Name/IP Address : {}", byAddress); } return true; } catch (UnknownHostException | DecoderException e) { diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/MockCRLStore.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/MockCRLStore.java index 6152b39c5971..0e2851e3df0d 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/MockCRLStore.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/update/server/MockCRLStore.java @@ -98,7 +98,7 @@ public BigInteger issueCert() throws Exception { public Optional revokeCert(List certs, Instant revokeTime) throws IOException { - log.debug("Revoke certs: ", certs.toString()); + log.debug("Revoke certs: {}", certs); Optional crlId = scmCertStore.revokeCertificates(certs, caCertificateHolder, CRLReason.lookup(CRLReason.keyCompromise), @@ -107,7 +107,7 @@ public Optional revokeCert(List certs, scmCertStore.getCrls(ImmutableList.of(crlId.get())); if (crlInfos.isEmpty()) { - log.debug("CRL[0]: {}", crlInfos.get(0).toString()); + log.debug("CRL[0]: {}", crlInfos.get(0)); } return crlId; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java index 009705114221..01cefe6637bd 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java @@ -800,7 +800,7 @@ protected Map refreshPipeline( return containerWithPipelineMap; } catch (IOException ioEx) { LOG.debug("Get containerPipeline failed for {}", - containerIDs.toString(), ioEx); + containerIDs, ioEx); throw new OMException(ioEx.getMessage(), SCM_GET_PIPELINE_EXCEPTION); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java index 83678c6afd4f..d773f0d141e7 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java @@ -126,9 +126,9 @@ public boolean moveToTrash(Path path) throws IOException { Path trashRoot = this.fs.getTrashRoot(path); String key = path.toUri().getPath(); - LOG.debug("Key path to moveToTrash: "+ key); + LOG.debug("Key path to moveToTrash: {}"+ key); String trashRootKey = trashRoot.toUri().getPath(); - LOG.debug("TrashrootKey for moveToTrash: "+ trashRootKey); + LOG.debug("TrashrootKey for moveToTrash: {}"+ trashRootKey); if (!OzoneFSUtils.isValidName(key)) { throw new InvalidPathException("Invalid path Name " + key); @@ -203,7 +203,7 @@ public void run() { trashRoots = fs.getTrashRoots(true); // list all trash dirs LOG.debug("Trash root Size: " + trashRoots.size()); for (FileStatus trashRoot : trashRoots) { // dump each trash - LOG.debug("Trashroot:" + trashRoot.getPath().toString()); + LOG.debug("Trashroot: {}" + trashRoot.getPath()); if (!trashRoot.isDirectory()) { continue; } @@ -280,7 +280,7 @@ private void createCheckpoint(Path trashRoot, Date date) throws IOException { private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) throws IOException { - LOG.debug("TrashPolicyOzone#deleteCheckpoint for trashRoot: " + trashRoot); + LOG.debug("TrashPolicyOzone#deleteCheckpoint for trashRoot: {}" + trashRoot); FileStatus[] dirs = null; try { @@ -303,7 +303,7 @@ private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) time = getTimeFromCheckpoint(name); } catch (ParseException e) { om.getMetrics().incNumTrashFails(); - LOG.warn("Unexpected item in trash: "+dir+". Ignoring."); + LOG.warn("Unexpected item in trash: {}"+dir+". Ignoring."); continue; } @@ -312,7 +312,7 @@ private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) LOG.debug("Deleted trash checkpoint:{} ", dir); } else { om.getMetrics().incNumTrashFails(); - LOG.warn("Couldn't delete checkpoint: " + dir + " Ignoring."); + LOG.warn("Couldn't delete checkpoint: {}" + dir + " Ignoring."); } } } diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java index 6f0f80b639b3..201814fdcae2 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java @@ -38,7 +38,7 @@ public class BadRequestExceptionMapper implements @Override public Response toResponse(BadRequestException exception) { if (LOG.isDebugEnabled()) { - LOG.debug("Returning exception. ex: {}", exception.toString()); + LOG.debug("Returning exception. ex: {}", exception); } return Response.status(Response.Status.BAD_REQUEST) From 5984abb870347e470de519ee06fadd3b91e1a057 Mon Sep 17 00:00:00 2001 From: sky76093016 <6ssssssky6@gmail.com> Date: Mon, 28 Jun 2021 11:49:33 +0800 Subject: [PATCH 2/7] HDDS-5383. Eliminate expensive string creation in debug log messages --- .../java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java index d773f0d141e7..68eab98bd803 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java @@ -201,7 +201,7 @@ public void run() { if (now >= end) { Collection trashRoots; trashRoots = fs.getTrashRoots(true); // list all trash dirs - LOG.debug("Trash root Size: " + trashRoots.size()); + LOG.debug("Trash root Size: {}" + trashRoots.size()); for (FileStatus trashRoot : trashRoots) { // dump each trash LOG.debug("Trashroot: {}" + trashRoot.getPath()); if (!trashRoot.isDirectory()) { @@ -266,7 +266,8 @@ private void createCheckpoint(Path trashRoot, Date date) throws IOException { while (true) { try { fs.rename(current, checkpoint); - LOG.debug("Created trash checkpoint: " + checkpoint.toUri().getPath()); + LOG.debug("Created trash checkpoint: {}" + + checkpoint.toUri().getPath()); break; } catch (FileAlreadyExistsException e) { if (++attempt > 1000) { @@ -280,7 +281,8 @@ private void createCheckpoint(Path trashRoot, Date date) throws IOException { private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) throws IOException { - LOG.debug("TrashPolicyOzone#deleteCheckpoint for trashRoot: {}" + trashRoot); + LOG.debug("TrashPolicyOzone#deleteCheckpoint for trashRoot: {}" + + trashRoot); FileStatus[] dirs = null; try { From 6c0379b1993bdd2003e808a8646e982228250b6d Mon Sep 17 00:00:00 2001 From: sky76093016 <6ssssssky6@gmail.com> Date: Mon, 28 Jun 2021 12:11:27 +0800 Subject: [PATCH 3/7] HDDS-5383. Eliminate expensive string creation in debug log messages --- .../hadoop/ozone/s3/exception/BadRequestExceptionMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java index 201814fdcae2..6f0f80b639b3 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/exception/BadRequestExceptionMapper.java @@ -38,7 +38,7 @@ public class BadRequestExceptionMapper implements @Override public Response toResponse(BadRequestException exception) { if (LOG.isDebugEnabled()) { - LOG.debug("Returning exception. ex: {}", exception); + LOG.debug("Returning exception. ex: {}", exception.toString()); } return Response.status(Response.Status.BAD_REQUEST) From 90d9fdfa5cbb7ecf93fbeb3662bc3dd81d8b5320 Mon Sep 17 00:00:00 2001 From: sky76093016 <6ssssssky6@gmail.com> Date: Mon, 28 Jun 2021 14:29:56 +0800 Subject: [PATCH 4/7] Fix minor issues --- .../hadoop/hdds/scm/storage/BlockOutputStream.java | 2 +- .../org/apache/hadoop/ozone/om/TrashPolicyOzone.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java index 566a209009d3..0c22466dddf9 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java @@ -595,7 +595,7 @@ private void setIoException(Exception e) { IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e); ioException.compareAndSet(null, exception); } else { - LOG.debug("Previous request had already failed with " + ioe + LOG.debug("Previous request had already failed with ", ioe + " so subsequent request also encounters" + " Storage Container Exception ", e); } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java index 68eab98bd803..e964bf11a68f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java @@ -126,9 +126,9 @@ public boolean moveToTrash(Path path) throws IOException { Path trashRoot = this.fs.getTrashRoot(path); String key = path.toUri().getPath(); - LOG.debug("Key path to moveToTrash: {}"+ key); + LOG.debug("Key path to moveToTrash: {}", key); String trashRootKey = trashRoot.toUri().getPath(); - LOG.debug("TrashrootKey for moveToTrash: {}"+ trashRootKey); + LOG.debug("TrashrootKey for moveToTrash: {}", trashRootKey); if (!OzoneFSUtils.isValidName(key)) { throw new InvalidPathException("Invalid path Name " + key); @@ -201,9 +201,9 @@ public void run() { if (now >= end) { Collection trashRoots; trashRoots = fs.getTrashRoots(true); // list all trash dirs - LOG.debug("Trash root Size: {}" + trashRoots.size()); + LOG.debug("Trash root Size: {}", trashRoots.size()); for (FileStatus trashRoot : trashRoots) { // dump each trash - LOG.debug("Trashroot: {}" + trashRoot.getPath()); + LOG.debug("Trashroot: {}", trashRoot.getPath()); if (!trashRoot.isDirectory()) { continue; } @@ -266,8 +266,8 @@ private void createCheckpoint(Path trashRoot, Date date) throws IOException { while (true) { try { fs.rename(current, checkpoint); - LOG.debug("Created trash checkpoint: {}" - + checkpoint.toUri().getPath()); + LOG.debug("Created trash checkpoint: {}", + checkpoint.toUri().getPath()); break; } catch (FileAlreadyExistsException e) { if (++attempt > 1000) { From 110429c3320ed11269a13f17ea47575e874f8b3e Mon Sep 17 00:00:00 2001 From: sky76093016 <6ssssssky6@gmail.com> Date: Mon, 28 Jun 2021 14:40:14 +0800 Subject: [PATCH 5/7] Modify format --- .../java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java index e964bf11a68f..6d9a25f350d7 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java @@ -281,8 +281,8 @@ private void createCheckpoint(Path trashRoot, Date date) throws IOException { private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) throws IOException { - LOG.debug("TrashPolicyOzone#deleteCheckpoint for trashRoot: {}" - + trashRoot); + LOG.debug("TrashPolicyOzone#deleteCheckpoint for trashRoot: {}", + trashRoot); FileStatus[] dirs = null; try { @@ -305,7 +305,7 @@ private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) time = getTimeFromCheckpoint(name); } catch (ParseException e) { om.getMetrics().incNumTrashFails(); - LOG.warn("Unexpected item in trash: {}"+dir+". Ignoring."); + LOG.warn("Unexpected item in trash: {} . Ignoring.", dir); continue; } @@ -314,7 +314,7 @@ private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) LOG.debug("Deleted trash checkpoint:{} ", dir); } else { om.getMetrics().incNumTrashFails(); - LOG.warn("Couldn't delete checkpoint: {}" + dir + " Ignoring."); + LOG.warn("Couldn't delete checkpoint: {} Ignoring.",dir); } } } From e75122f25e3fb2573aa72682574f6b7f0371b812 Mon Sep 17 00:00:00 2001 From: sky76093016 <6ssssssky6@gmail.com> Date: Mon, 28 Jun 2021 14:47:44 +0800 Subject: [PATCH 6/7] Modify format --- .../apache/hadoop/hdds/scm/storage/BlockOutputStream.java | 6 +++--- .../java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java index 0c22466dddf9..ca674949cb0f 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java @@ -595,9 +595,9 @@ private void setIoException(Exception e) { IOException exception = new IOException(EXCEPTION_MSG + e.toString(), e); ioException.compareAndSet(null, exception); } else { - LOG.debug("Previous request had already failed with ", ioe - + " so subsequent request also encounters" - + " Storage Container Exception ", e); + LOG.debug("Previous request had already failed with {} " + + "so subsequent request also encounters " + + "Storage Container Exception {}", ioe, e); } } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java index 6d9a25f350d7..153a0cdfe45b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java @@ -314,7 +314,7 @@ private void deleteCheckpoint(Path trashRoot, boolean deleteImmediately) LOG.debug("Deleted trash checkpoint:{} ", dir); } else { om.getMetrics().incNumTrashFails(); - LOG.warn("Couldn't delete checkpoint: {} Ignoring.",dir); + LOG.warn("Couldn't delete checkpoint: {} Ignoring.", dir); } } } From af38f5fc35152ba41f30f5cc38fd45277be02345 Mon Sep 17 00:00:00 2001 From: sky76093016 <6ssssssky6@gmail.com> Date: Mon, 28 Jun 2021 15:34:27 +0800 Subject: [PATCH 7/7] Fix SCMSecurityProtocolFailoverProxyProvider.java and SCMBlockLocationFailoverProxyProvider.java --- .../scm/proxy/SCMBlockLocationFailoverProxyProvider.java | 8 +++++--- .../proxy/SCMSecurityProtocolFailoverProxyProvider.java | 8 +++++--- .../java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java | 6 ++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java index 34f91d63e413..0ee19d5f0132 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMBlockLocationFailoverProxyProvider.java @@ -184,9 +184,11 @@ public synchronized void performFailoverToAssignedLeader(String newLeader, LOG.debug("Performing failover to suggested leader {}, nodeId {}", snle.getSuggestedLeader(), newLeader); } else { - LOG.debug("Suggested leader {} does not match with any of the " + - "proxyInfo adress {}", snle.getSuggestedLeader(), - Arrays.toString(scmProxyInfoMap.values().toArray())); + if (LOG.isDebugEnabled()) { + LOG.debug("Suggested leader {} does not match with any of the " + + "proxyInfo adress {}", snle.getSuggestedLeader(), + Arrays.toString(scmProxyInfoMap.values().toArray())); + } } } assignLeaderToNode(newLeader); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMSecurityProtocolFailoverProxyProvider.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMSecurityProtocolFailoverProxyProvider.java index bf4eb87d17f0..18d1be6b4338 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMSecurityProtocolFailoverProxyProvider.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMSecurityProtocolFailoverProxyProvider.java @@ -208,9 +208,11 @@ public synchronized void performFailoverToAssignedLeader(String newLeader, LOG.debug("Performing failover to suggested leader {}, nodeId {}", snle.getSuggestedLeader(), newLeader); } else { - LOG.debug("Suggested leader {} does not match with any of the " + - "proxyInfo adress {}", snle.getSuggestedLeader(), - Arrays.toString(scmProxyInfoMap.values().toArray())); + if (LOG.isDebugEnabled()) { + LOG.debug("Suggested leader {} does not match with any of the " + + "proxyInfo adress {}", snle.getSuggestedLeader(), + Arrays.toString(scmProxyInfoMap.values().toArray())); + } } } assignLeaderToNode(newLeader); diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java index 153a0cdfe45b..0d1e56ceb54a 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/TrashPolicyOzone.java @@ -266,8 +266,10 @@ private void createCheckpoint(Path trashRoot, Date date) throws IOException { while (true) { try { fs.rename(current, checkpoint); - LOG.debug("Created trash checkpoint: {}", - checkpoint.toUri().getPath()); + if (LOG.isDebugEnabled()) { + LOG.debug("Created trash checkpoint: {}", + checkpoint.toUri().getPath()); + } break; } catch (FileAlreadyExistsException e) { if (++attempt > 1000) {