Browse Source

HDFS-14125. Use parameterized log format in ECTopologyVerifier. Contributed by Kitti Nanasi.

Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org>
(cherry picked from commit 5f15a60e329b8d0a495a977dc5255126814c5271)
Kitti Nanasi 6 years ago
parent
commit
3ba40d0ccf

+ 9 - 9
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/ECTopologyVerifier.java

@@ -93,24 +93,24 @@ public final class ECTopologyVerifier {
       final int numOfRacks, final int numOfDataNodes, String readablePolicies) {
       final int numOfRacks, final int numOfDataNodes, String readablePolicies) {
     String resultMessage;
     String resultMessage;
     if (numOfDataNodes < minDN) {
     if (numOfDataNodes < minDN) {
-      resultMessage = "The number of DataNodes (" + numOfDataNodes
-          + ") is less than the minimum required number of DataNodes ("
-          + minDN + ") for the erasure coding policies: " + readablePolicies;
+      resultMessage = String.format("The number of DataNodes (%d) is less " +
+          "than the minimum required number of DataNodes (%d) for the " +
+          "erasure coding policies: %s", numOfDataNodes, minDN,
+          readablePolicies);
       LOG.debug(resultMessage);
       LOG.debug(resultMessage);
       return new ECTopologyVerifierResult(false, resultMessage);
       return new ECTopologyVerifierResult(false, resultMessage);
     }
     }
 
 
     if (numOfRacks < minRack) {
     if (numOfRacks < minRack) {
-      resultMessage = "The number of racks (" + numOfRacks
-          + ") is less than the minimum required number of racks ("
-          + minRack + ") for the erasure coding policies: "
-          + readablePolicies;
+      resultMessage = String.format("The number of racks (%d) is less than " +
+          "the minimum required number of racks (%d) for the erasure " +
+          "coding policies: %s", numOfRacks, minRack, readablePolicies);
       LOG.debug(resultMessage);
       LOG.debug(resultMessage);
       return new ECTopologyVerifierResult(false, resultMessage);
       return new ECTopologyVerifierResult(false, resultMessage);
     }
     }
     return new ECTopologyVerifierResult(true,
     return new ECTopologyVerifierResult(true,
-        "The cluster setup can support EC policies: "
-            + readablePolicies);
+        String.format("The cluster setup can support EC policies: %s",
+            readablePolicies));
   }
   }
 
 
   private static int getNumberOfRacks(DatanodeInfo[] report) {
   private static int getNumberOfRacks(DatanodeInfo[] report) {