From 814b3b2eed398671b7d124509b4a2b5a87e3680d Mon Sep 17 00:00:00 2001 From: sel-fish Date: Sun, 18 Mar 2018 22:20:42 +0800 Subject: [PATCH 1/2] ZOOKEEPER-3001: Incorrect log message when try to delete container node --- .../main/org/apache/zookeeper/server/ContainerManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/main/org/apache/zookeeper/server/ContainerManager.java b/src/java/main/org/apache/zookeeper/server/ContainerManager.java index fb1cb66861a..eb0c1cba81f 100644 --- a/src/java/main/org/apache/zookeeper/server/ContainerManager.java +++ b/src/java/main/org/apache/zookeeper/server/ContainerManager.java @@ -116,8 +116,8 @@ public void checkContainers() Request request = new Request(null, 0, 0, ZooDefs.OpCode.deleteContainer, path, null); try { - LOG.info("Attempting to delete candidate container: %s", - containerPath); + LOG.info(String.format("Attempting to delete candidate container: %s", + containerPath)); requestProcessor.processRequest(request); } catch (Exception e) { LOG.error(String.format("Could not delete container: %s" , From 0059d94d79d5332ae3b93ca1f0375a64613aec4f Mon Sep 17 00:00:00 2001 From: sel-fish Date: Mon, 19 Mar 2018 18:41:52 +0800 Subject: [PATCH 2/2] replace String.format by formatting anchor --- .../org/apache/zookeeper/server/ContainerManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/main/org/apache/zookeeper/server/ContainerManager.java b/src/java/main/org/apache/zookeeper/server/ContainerManager.java index eb0c1cba81f..db86e890a7b 100644 --- a/src/java/main/org/apache/zookeeper/server/ContainerManager.java +++ b/src/java/main/org/apache/zookeeper/server/ContainerManager.java @@ -116,12 +116,12 @@ public void checkContainers() Request request = new Request(null, 0, 0, ZooDefs.OpCode.deleteContainer, path, null); try { - LOG.info(String.format("Attempting to delete candidate container: %s", - containerPath)); + LOG.info("Attempting to delete candidate container: {}", + containerPath); requestProcessor.processRequest(request); } catch (Exception e) { - LOG.error(String.format("Could not delete container: %s" , - containerPath), e); + LOG.error("Could not delete container: {}", + containerPath, e); } long elapsedMs = Time.currentElapsedTime() - startMs;