[CELEBORN-986] Use formatted log instead of string concat

### What changes were proposed in this pull request? ### Why are the changes needed? ### Does this PR introduce _any_ user-facing change? ### How was this patch tested? GA Closes #1941 from cxzl25/CELEBORN-986. Authored-by: sychen <[email protected]> Signed-off-by: zky.zhoukeyong <[email protected]>
apache · Sep 28, 2023 · a9ed7f6 · a9ed7f6
1 parent ef4fc51
commit a9ed7f6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/client-flink/common/src/main/java/org/apache/celeborn/plugin/flink/RemoteShuffleMaster.java b/client-flink/common/src/main/java/org/apache/celeborn/plugin/flink/RemoteShuffleMaster.java
@@ -227,7 +227,7 @@ public void close() throws Exception {
       jobShuffleIds.clear();
       lifecycleManager.stop();
     } catch (Exception e) {
-      LOG.warn("Encounter exception when shutdown: " + e.getMessage(), e);
+      LOG.warn("Encounter exception when shutdown: {}", e.getMessage(), e);
     }
 
     ThreadUtils.shutdownExecutors(10, executor);

diff --git a/...nk/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterTest.java b/...nk/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleMasterTest.java
@@ -93,7 +93,7 @@ public void testRegisterPartitionWithProducer()
     ShuffleResourceDescriptor mapPartitionShuffleDescriptor =
         shuffleResource.getMapPartitionShuffleDescriptor();
 
-    LOG.info("remoteShuffleDescriptor:", remoteShuffleDescriptor);
+    LOG.info("remoteShuffleDescriptor:{}", remoteShuffleDescriptor);
     Assert.assertEquals(0, mapPartitionShuffleDescriptor.getShuffleId());
     Assert.assertEquals(0, mapPartitionShuffleDescriptor.getPartitionId());
     Assert.assertEquals(0, mapPartitionShuffleDescriptor.getAttemptId());

diff --git a/common/src/main/java/org/apache/celeborn/common/client/MasterClient.java b/common/src/main/java/org/apache/celeborn/common/client/MasterClient.java
@@ -137,7 +137,7 @@ private <T> T sendMessageInner(Object message, Class<T> clz) throws Throwable {
           .requestId_(encodeRequestId(UUID.randomUUID().toString(), nextCallId()));
     }
 
-    LOG.debug("Send rpc message " + message);
+    LOG.debug("Send rpc message {}", message);
     RpcEndpointRef endpointRef = null;
     // Use AtomicInteger or Integer or any Object which holds an int value is ok, we just need to
     // transfer an object to get the change of the current index of master addresses.

diff --git a/common/src/main/java/org/apache/celeborn/common/util/ShutdownHookManager.java b/common/src/main/java/org/apache/celeborn/common/util/ShutdownHookManager.java
@@ -115,19 +115,9 @@ static int executeShutdown() {
       } catch (TimeoutException ex) {
         timeouts++;
         future.cancel(true);
-        LOG.warn(
-            "ShutdownHook '"
-                + entry.getHook().getClass().getSimpleName()
-                + "' timeout, "
-                + ex.toString(),
-            ex);
+        LOG.warn("ShutdownHook '{}' timeout", entry.getHook().getClass().getSimpleName(), ex);
       } catch (Throwable ex) {
-        LOG.warn(
-            "ShutdownHook '"
-                + entry.getHook().getClass().getSimpleName()
-                + "' failed, "
-                + ex.toString(),
-            ex);
+        LOG.warn("ShutdownHook '{}' failed", entry.getHook().getClass().getSimpleName(), ex);
       }
     }
     return timeouts;
@@ -144,13 +134,13 @@ private static void shutdownExecutor(final CelebornConf conf) {
       long shutdownTimeout = getShutdownTimeout(conf);
       if (!EXECUTOR.awaitTermination(shutdownTimeout, TIME_UNIT_DEFAULT)) {
         // timeout waiting for the
-        LOG.error("ShutdownHookManger shutdown forcefully after" + " {} seconds.", shutdownTimeout);
+        LOG.error("ShutdownHookManger shutdown forcefully after {} seconds.", shutdownTimeout);
         EXECUTOR.shutdownNow();
       }
       LOG.debug("ShutdownHookManger completed shutdown.");
     } catch (InterruptedException ex) {
       // interrupted.
-      LOG.error("ShutdownHookManger interrupted while waiting for " + "termination.", ex);
+      LOG.error("ShutdownHookManger interrupted while waiting for termination.", ex);
       EXECUTOR.shutdownNow();
       Thread.currentThread().interrupt();
     }

diff --git a/...r/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/MetaHandler.java b/...r/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/ha/MetaHandler.java
@@ -74,7 +74,7 @@ public ResourceResponse handleReadRequest(ResourceProtos.ResourceRequest request
           throw new IOException("Can not parse this command!" + request);
       }
     } catch (IOException e) {
-      LOG.warn("Handle meta read request " + cmdType + " failed!", e);
+      LOG.warn("Handle meta read request {} failed!", cmdType, e);
       responseBuilder.setSuccess(false);
       responseBuilder.setStatus(ResourceProtos.Status.INTERNAL_ERROR);
       if (e.getMessage() != null) {
@@ -241,7 +241,7 @@ public ResourceResponse handleWriteRequest(ResourceProtos.ResourceRequest reques
       }
       responseBuilder.setStatus(ResourceProtos.Status.OK);
     } catch (IOException e) {
-      LOG.warn("Handle meta write request " + cmdType + " failed!", e);
+      LOG.warn("Handle meta write request {} failed!", cmdType, e);
       responseBuilder.setSuccess(false);
       responseBuilder.setStatus(ResourceProtos.Status.INTERNAL_ERROR);
       if (e.getMessage() != null) {