From 9db9a0d78499a2c31e9308b45a9166a808505734 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Fri, 8 Nov 2019 21:23:12 +0100
Subject: [PATCH] HDDS-2451. Use lazy string evaluation in preconditions

---
 .../src/main/java/org/apache/hadoop/hdds/HddsUtils.java   | 2 +-
 .../commandhandler/ReplicateContainerCommandHandler.java  | 4 ++--
 .../transport/server/ratis/ContainerStateMachine.java     | 8 ++++----
 .../OzoneManagerProtocolServerSideTranslatorPB.java       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
index 22cce2730ba0..52d57f76f9de 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
@@ -589,6 +589,6 @@ public static void validatePath(Path path, Path ancestor) {
         "Ancestor should not be null");
     Preconditions.checkArgument(
         path.normalize().startsWith(ancestor.normalize()),
-        "Path should be a descendant of " + ancestor);
+        "Path should be a descendant of %s", ancestor);
   }
 }
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ReplicateContainerCommandHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ReplicateContainerCommandHandler.java
index a028041b1967..a96032e5c4c0 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ReplicateContainerCommandHandler.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ReplicateContainerCommandHandler.java
@@ -68,8 +68,8 @@ public void handle(SCMCommand command, OzoneContainer container,
     final long containerID = replicateCommand.getContainerID();
 
     Preconditions.checkArgument(sourceDatanodes.size() > 0,
-        String.format("Replication command is received for container %d "
-            + "but the size of source datanodes was 0.", containerID));
+        "Replication command is received for container %s "
+            + "without source datanodes.", containerID);
 
     supervisor.addTask(new ReplicationTask(containerID, sourceDatanodes));
   }
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
index 9d6a189833aa..6a8dd93595df 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
@@ -576,10 +576,10 @@ private ByteString readStateMachineData(
     ByteString data = responseProto.getData();
     // assert that the response has data in it.
     Preconditions
-        .checkNotNull(data, "read chunk data is null for chunk:" + chunkInfo);
-    Preconditions.checkState(data.size() == chunkInfo.getLen(), String.format(
-        "read chunk len=%d does not match chunk expected len=%d for chunk:%s",
-        data.size(), chunkInfo.getLen(), chunkInfo));
+        .checkNotNull(data, "read chunk data is null for chunk: %s", chunkInfo);
+    Preconditions.checkState(data.size() == chunkInfo.getLen(),
+        "read chunk len=%s does not match chunk expected len=%s for chunk:%s",
+        data.size(), chunkInfo.getLen(), chunkInfo);
     return data;
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
index 72b0973b4432..d37ffee9210f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java
@@ -210,7 +210,7 @@ private OMResponse submitRequestDirectlyToOM(OMRequest request) {
         OMClientRequest omClientRequest =
             OzoneManagerRatisUtils.createClientRequest(request);
         Preconditions.checkState(omClientRequest != null,
-            "Unrecognized write command type request" + request.toString());
+            "Unrecognized write command type request: %s", request);
         request = omClientRequest.preExecute(ozoneManager);
         index = transactionIndex.incrementAndGet();
         omClientRequest = OzoneManagerRatisUtils.createClientRequest(request);