Fix log format and copyBlockCrossNamespace with finally release resources

Author: LiuGuH

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java

@@ -1964,17 +1964,21 @@ protected void copyBlockCrossNamespace(ExtendedBlock sourceBlk,
     IOStreamPair pair =
         DFSUtilClient.connectToDN(sourceDatanode, getConf().getSocketTimeout(), conf, saslClient,
             socketFactory, getConf().isConnectToDnViaHostname(), this, sourceBlockToken);
+    try {
+      new Sender((DataOutputStream) pair.out).copyBlockCrossNamespace(sourceBlk, sourceBlockToken,
+          targetBlk, targetBlockToken, targetDatanode);
 
-    new Sender((DataOutputStream) pair.out).copyBlockCrossNamespace(sourceBlk, sourceBlockToken,
-        targetBlk, targetBlockToken, targetDatanode);
-
-    pair.out.flush();
+      pair.out.flush();
 
-    DataInputStream reply = new DataInputStream(pair.in);
-    BlockOpResponseProto proto = BlockOpResponseProto.parseFrom(PBHelperClient.vintPrefixed(reply));
-    DataTransferProtoUtil.checkBlockOpStatus(proto,
-        "copyBlockCrossNamespace " + sourceBlk + " to " + targetBlk + " from " + sourceDatanode
-            + " to " + targetDatanode);
+      DataInputStream reply = new DataInputStream(pair.in);
+      BlockOpResponseProto proto =
+          BlockOpResponseProto.parseFrom(PBHelperClient.vintPrefixed(reply));
+      DataTransferProtoUtil.checkBlockOpStatus(proto,
+          "copyBlockCrossNamespace " + sourceBlk + " to " + targetBlk + " from " + sourceDatanode
+              + " to " + targetDatanode);
+    } finally {
+      IOUtilsClient.cleanupWithLogger(LOG, pair.in, pair.out);
+    }
   }
 
   /**

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -3124,17 +3124,17 @@ public void run() {
 
         // read ack
         if (isClient) {
-          DNTransferAckProto closeAck =
-              DNTransferAckProto.parseFrom(PBHelperClient.vintPrefixed(in));
+          DNTransferAckProto closeAck = DNTransferAckProto.parseFrom(
+              PBHelperClient.vintPrefixed(in));
           LOG.debug("{}: close-ack={}", getClass().getSimpleName(), closeAck);
           if (closeAck.getStatus() != Status.SUCCESS) {
             if (closeAck.getStatus() == Status.ERROR_ACCESS_TOKEN) {
               throw new InvalidBlockTokenException(
-                  "Got access token error for connect ack, targets=" + Arrays.asList(targets));
+                  "Got access token error for connect ack, targets="
+                   + Arrays.asList(targets));
             } else {
-              throw new IOException(
-                  "Bad connect ack, targets=" + Arrays.asList(targets) + " status="
-                      + closeAck.getStatus());
+              throw new IOException("Bad connect ack, targets="
+                  + Arrays.asList(targets) + " status=" + closeAck.getStatus());
             }
           }
         } else {
@@ -3145,7 +3145,8 @@ public void run() {
           throw new RuntimeException(ie);
         }
         handleBadBlock(source, ie, false);
-        LOG.warn("{}:Failed to transfer {} to {}  got", bpReg, source, targets[0], ie);
+        LOG.warn("{}:Failed to transfer {} to {}  got",
+            bpReg, source, targets[0], ie);
       } catch (Throwable t) {
         LOG.error("Failed to transfer block {}", source, t);
         if (copyBlockCrossNamespace) {
@@ -4428,9 +4429,8 @@ public void copyBlockCrossNamespace(ExtendedBlock sourceBlk, ExtendedBlock targe
       LOG.info(msg);
       throw new IOException(msg);
     }
-    LOG.info(getDatanodeInfo() + " copyBlock: Starting thread to transfer: " + "block:"
-        + sourceBlk + " from " + this.getDatanodeUuid() + " to " + targetDn.getDatanodeUuid()
-        + "(" + targetDn + ")");
+    LOG.info("{} copyBlock: Starting thread to transfer block {} from {} to {} ({})",
+        getDatanodeInfo(), sourceBlk, this.getDatanodeUuid(), targetDn.getDatanodeUuid(), targetDn);
     Future<?> result;
     if (this.getDatanodeUuid().equals(targetDn.getDatanodeUuid())) {
       result = copyBlockCrossNamespaceExecutor.submit(new LocalBlockCopy(sourceBlk, targetBlk));
@@ -4485,15 +4485,14 @@ public Boolean call() throws IOException {
 
         BlockLocalPathInfo srcBlpi = data.getBlockLocalPathInfo(sourceBlk);
         BlockLocalPathInfo dstBlpi = data.getBlockLocalPathInfo(targetBlk);
-        LOG.info(
-            getClass().getSimpleName() + ": Hardlinked " + sourceBlk + "( " + srcBlpi.getBlockPath()
-                + " " + srcBlpi.getMetaPath() + " ) " + "to " + targetBlk + "( "
-                + dstBlpi.getBlockPath() + " " + dstBlpi.getMetaPath() + " ) ");
+        LOG.info("{}: Hardlinked {} ( {} {} ) to {} ( {} {} ).", getClass().getSimpleName(),
+            sourceBlk, srcBlpi.getBlockPath(), srcBlpi.getMetaPath(), targetBlk,
+            dstBlpi.getBlockPath(), dstBlpi.getMetaPath());
 
         metrics.incrBlocksReplicatedViaHardlink();
       } catch (IOException e) {
-        LOG.warn("Local block copy for src : " + sourceBlk.getBlockName() + ", dst : "
-            + targetBlk.getBlockName() + " failed", e);
+        LOG.warn("Local block copy from {} to {} failed: {}", sourceBlk.getBlockName(),
+            targetBlk.getBlockName(), e);
         throw e;
       }
       return true;