HDFS-10383. Safely close resources in DFSTestUtil. Contributed by Mingliang Liu.

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java

@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.hdfs;
 
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_KEY;
 import static org.apache.hadoop.fs.CreateFlag.CREATE;
 import static org.apache.hadoop.fs.CreateFlag.LAZY_PERSIST;
 import static org.apache.hadoop.fs.CreateFlag.OVERWRITE;
@@ -147,6 +148,7 @@ import org.apache.hadoop.hdfs.server.protocol.ReceivedDeletedBlockInfo.BlockStat
 import org.apache.hadoop.hdfs.server.protocol.StorageReceivedDeletedBlocks;
 import org.apache.hadoop.hdfs.tools.DFSAdmin;
 import org.apache.hadoop.hdfs.tools.JMXGet;
+import org.apache.hadoop.io.EnumSetWritable;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.nativeio.NativeIO;
 import org.apache.hadoop.net.NetUtils;
@@ -314,9 +316,10 @@ public class DFSTestUtil {
   }
 
   public static byte[] readFileAsBytes(FileSystem fs, Path fileName) throws IOException {
-    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
-    IOUtils.copyBytes(fs.open(fileName), os, 1024, true);
+      IOUtils.copyBytes(fs.open(fileName), os, 1024);
-    return os.toByteArray();
+      return os.toByteArray();
+    }
   }
   
   /** create nFiles with random names and directory hierarchies
@@ -346,17 +349,10 @@ public class DFSTestUtil {
 
   public static byte[] readFileBuffer(FileSystem fs, Path fileName) 
       throws IOException {
-    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    try (ByteArrayOutputStream os = new ByteArrayOutputStream();
-    try {
+         FSDataInputStream in = fs.open(fileName)) {
-      FSDataInputStream in = fs.open(fileName);
+      IOUtils.copyBytes(in, os, 1024, true);
-      try {
+      return os.toByteArray();
-        IOUtils.copyBytes(in, os, 1024, true);
-        return os.toByteArray();
-      } finally {
-        in.close();
-      }
-    } finally {
-      os.close();
     }
   }
   
@@ -384,51 +380,40 @@ public class DFSTestUtil {
       boolean isLazyPersist, int bufferLen, long fileLen, long blockSize,
       short replFactor, long seed, boolean flush,
       InetSocketAddress[] favoredNodes) throws IOException {
-  assert bufferLen > 0;
+    assert bufferLen > 0;
-  if (!fs.mkdirs(fileName.getParent())) {
+    if (!fs.mkdirs(fileName.getParent())) {
       throw new IOException("Mkdirs failed to create " +
-                fileName.getParent().toString());
+          fileName.getParent().toString());
-  }
-  FSDataOutputStream out = null;
-  EnumSet<CreateFlag> createFlags = EnumSet.of(CREATE);
-  createFlags.add(OVERWRITE);
-  if (isLazyPersist) {
-    createFlags.add(LAZY_PERSIST);
-  }
-  try {
-    if (favoredNodes == null) {
-      out = fs.create(
-        fileName,
-        FsPermission.getFileDefault(),
-        createFlags,
-        fs.getConf().getInt(
-          CommonConfigurationKeys.IO_FILE_BUFFER_SIZE_KEY, 4096),
-        replFactor, blockSize, null);
-    } else {
-      out = ((DistributedFileSystem) fs).create(fileName,
-        FsPermission.getDefault(), true, bufferLen, replFactor, blockSize,
-        null, favoredNodes);
     }
+    EnumSet<CreateFlag> createFlags = EnumSet.of(CREATE);
+    createFlags.add(OVERWRITE);
+    if (isLazyPersist) {
+      createFlags.add(LAZY_PERSIST);
+    }
+    try (FSDataOutputStream out = (favoredNodes == null) ?
+        fs.create(fileName, FsPermission.getFileDefault(), createFlags,
+            fs.getConf().getInt(IO_FILE_BUFFER_SIZE_KEY, 4096), replFactor,
+            blockSize, null)
+        :
+        ((DistributedFileSystem) fs).create(fileName, FsPermission.getDefault(),
+            true, bufferLen, replFactor, blockSize, null, favoredNodes)
+    ) {
       if (fileLen > 0) {
         byte[] toWrite = new byte[bufferLen];
         Random rb = new Random(seed);
         long bytesToWrite = fileLen;
-        while (bytesToWrite>0) {
+        while (bytesToWrite > 0) {
           rb.nextBytes(toWrite);
           int bytesToWriteNext = (bufferLen < bytesToWrite) ? bufferLen
-            : (int) bytesToWrite;
+              : (int) bytesToWrite;
 
-            out.write(toWrite, 0, bytesToWriteNext);
+          out.write(toWrite, 0, bytesToWriteNext);
-            bytesToWrite -= bytesToWriteNext;
+          bytesToWrite -= bytesToWriteNext;
         }
         if (flush) {
           out.hsync();
         }
       }
-    } finally {
-      if (out != null) {
-        out.close();
-      }
     }
   }
   
@@ -445,20 +430,18 @@ public class DFSTestUtil {
     
     for (int idx = 0; idx < nFiles; idx++) {
       Path fPath = new Path(root, files[idx].getName());
-      FSDataInputStream in = fs.open(fPath);
+      try (FSDataInputStream in = fs.open(fPath)) {
-      byte[] toRead = new byte[files[idx].getSize()];
+        byte[] toRead = new byte[files[idx].getSize()];
-      byte[] toCompare = new byte[files[idx].getSize()];
+        byte[] toCompare = new byte[files[idx].getSize()];
-      Random rb = new Random(files[idx].getSeed());
+        Random rb = new Random(files[idx].getSeed());
-      rb.nextBytes(toCompare);
+        rb.nextBytes(toCompare);
-      in.readFully(0, toRead);
+        in.readFully(0, toRead);
-      in.close();
+        for (int i = 0; i < toRead.length; i++) {
-      for (int i = 0; i < toRead.length; i++) {
+          if (toRead[i] != toCompare[i]) {
-        if (toRead[i] != toCompare[i]) {
+            return false;
-          return false;
+          }
         }
       }
-      toRead = null;
-      toCompare = null;
     }
     
     return true;
@@ -492,16 +475,13 @@ public class DFSTestUtil {
    */
   public static boolean allBlockReplicasCorrupt(MiniDFSCluster cluster,
       Path file, int blockNo) throws IOException {
-    DFSClient client = new DFSClient(new InetSocketAddress("localhost",
+    try (DFSClient client = new DFSClient(new InetSocketAddress("localhost",
-        cluster.getNameNodePort()), cluster.getConfiguration(0));
+        cluster.getNameNodePort()), cluster.getConfiguration(0))) {
-    LocatedBlocks blocks;
+      LocatedBlocks blocks;
-    try {
+      blocks = client.getNamenode().getBlockLocations(
-       blocks = client.getNamenode().getBlockLocations(
            file.toString(), 0, Long.MAX_VALUE);
-    } finally {
+      return blocks.get(blockNo).isCorrupt();
-      client.close();
     }
-    return blocks.get(blockNo).isCorrupt();
   }
 
   /*
@@ -781,12 +761,9 @@ public class DFSTestUtil {
   }
   
   public static ExtendedBlock getFirstBlock(FileSystem fs, Path path) throws IOException {
-    HdfsDataInputStream in = (HdfsDataInputStream) fs.open(path);
+    try (HdfsDataInputStream in = (HdfsDataInputStream) fs.open(path)) {
-    try {
       in.readByte();
       return in.getCurrentBlock();
-    } finally {
-      in.close();
     }
   }  
 
@@ -797,8 +774,9 @@ public class DFSTestUtil {
 
   public static List<LocatedBlock> getAllBlocks(FileSystem fs, Path path)
       throws IOException {
-    HdfsDataInputStream in = (HdfsDataInputStream) fs.open(path);
+    try (HdfsDataInputStream in = (HdfsDataInputStream) fs.open(path)) {
-    return in.getAllBlocks();
+      return in.getAllBlocks();
+    }
   }
 
   public static Token<BlockTokenIdentifier> getBlockToken(
@@ -807,17 +785,21 @@ public class DFSTestUtil {
   }
 
   public static String readFile(File f) throws IOException {
-    StringBuilder b = new StringBuilder();
+    try (BufferedReader in = new BufferedReader(new FileReader(f))) {
-    BufferedReader in = new BufferedReader(new FileReader(f));
+      StringBuilder b = new StringBuilder();
-    for(int c; (c = in.read()) != -1; b.append((char)c));
+      int c;
-    in.close();      
+      while ((c = in.read()) != -1) {
-    return b.toString();
+        b.append((char) c);
+      }
+      return b.toString();
+    }
   }
 
   public static byte[] readFileAsBytes(File f) throws IOException {
-    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
-    IOUtils.copyBytes(new FileInputStream(f), os, 1024, true);
+      IOUtils.copyBytes(new FileInputStream(f), os, 1024);
-    return os.toByteArray();
+      return os.toByteArray();
+    }
   }
 
   /* Write the given bytes to the given file */
@@ -826,9 +808,10 @@ public class DFSTestUtil {
     if (fs.exists(p)) {
       fs.delete(p, true);
     }
-    InputStream is = new ByteArrayInputStream(bytes);
+    try (InputStream is = new ByteArrayInputStream(bytes);
-    FSDataOutputStream os = fs.create(p);
+      FSDataOutputStream os = fs.create(p)) {
-    IOUtils.copyBytes(is, os, bytes.length, true);
+      IOUtils.copyBytes(is, os, bytes.length);
+    }
   }
 
   /* Write the given string to the given file */
@@ -841,9 +824,10 @@ public class DFSTestUtil {
   public static void appendFile(FileSystem fs, Path p, String s) 
       throws IOException {
     assert fs.exists(p);
-    InputStream is = new ByteArrayInputStream(s.getBytes());
+    try (InputStream is = new ByteArrayInputStream(s.getBytes());
-    FSDataOutputStream os = fs.append(p);
+      FSDataOutputStream os = fs.append(p)) {
-    IOUtils.copyBytes(is, os, s.length(), true);
+      IOUtils.copyBytes(is, os, s.length());
+    }
   }
   
   /**
@@ -860,9 +844,9 @@ public class DFSTestUtil {
     byte[] toAppend = new byte[length];
     Random random = new Random();
     random.nextBytes(toAppend);
-    FSDataOutputStream out = fs.append(p);
+    try (FSDataOutputStream out = fs.append(p)) {
-    out.write(toAppend);
+      out.write(toAppend);
-    out.close();
+    }
   }
   
   /**
@@ -980,35 +964,32 @@ public class DFSTestUtil {
    */
   public static byte[] loadFile(String filename) throws IOException {
     File file = new File(filename);
-    DataInputStream in = new DataInputStream(new FileInputStream(file));
+    try (DataInputStream in = new DataInputStream(new FileInputStream(file))) {
-    byte[] content = new byte[(int)file.length()];
+      byte[] content = new byte[(int) file.length()];
-    try {
       in.readFully(content);
-    } finally {
+      return content;
-      IOUtils.cleanup(LOG, in);
     }
-    return content;
   }
 
   /** For {@link TestTransferRbw} */
   public static BlockOpResponseProto transferRbw(final ExtendedBlock b, 
       final DFSClient dfsClient, final DatanodeInfo... datanodes) throws IOException {
     assertEquals(2, datanodes.length);
-    final Socket s = DataStreamer.createSocketForPipeline(datanodes[0],
-        datanodes.length, dfsClient);
     final long writeTimeout = dfsClient.getDatanodeWriteTimeout(datanodes.length);
-    final DataOutputStream out = new DataOutputStream(new BufferedOutputStream(
+    try (Socket s = DataStreamer.createSocketForPipeline(datanodes[0],
-        NetUtils.getOutputStream(s, writeTimeout),
+             datanodes.length, dfsClient);
-        DFSUtilClient.getSmallBufferSize(dfsClient.getConfiguration())));
+         DataOutputStream out = new DataOutputStream(new BufferedOutputStream(
-    final DataInputStream in = new DataInputStream(NetUtils.getInputStream(s));
+             NetUtils.getOutputStream(s, writeTimeout),
+             DFSUtilClient.getSmallBufferSize(dfsClient.getConfiguration())));
+         DataInputStream in = new DataInputStream(NetUtils.getInputStream(s))) {
+      // send the request
+      new Sender(out).transferBlock(b, new Token<BlockTokenIdentifier>(),
+          dfsClient.clientName, new DatanodeInfo[]{datanodes[1]},
+          new StorageType[]{StorageType.DEFAULT});
+      out.flush();
 
-    // send the request
+      return BlockOpResponseProto.parseDelimitedFrom(in);
-    new Sender(out).transferBlock(b, new Token<BlockTokenIdentifier>(),
+    }
-        dfsClient.clientName, new DatanodeInfo[]{datanodes[1]},
-        new StorageType[]{StorageType.DEFAULT});
-    out.flush();
-
-    return BlockOpResponseProto.parseDelimitedFrom(in);
   }
   
   public static void setFederatedConfiguration(MiniDFSCluster cluster,
@@ -1556,13 +1537,12 @@ public class DFSTestUtil {
    */
   public static void verifyFilesEqual(FileSystem fs, Path p1, Path p2, int len)
       throws IOException {
-    final FSDataInputStream in1 = fs.open(p1);
+    try (FSDataInputStream in1 = fs.open(p1);
-    final FSDataInputStream in2 = fs.open(p2);
+         FSDataInputStream in2 = fs.open(p2)) {
-    for (int i = 0; i < len; i++) {
+      for (int i = 0; i < len; i++) {
-      assertEquals("Mismatch at byte " + i, in1.read(), in2.read());
+        assertEquals("Mismatch at byte " + i, in1.read(), in2.read());
+      }
     }
-    in1.close();
-    in2.close();
   }
 
   /**
@@ -1575,20 +1555,15 @@ public class DFSTestUtil {
    * @throws IOException
    */
   public static void verifyFilesNotEqual(FileSystem fs, Path p1, Path p2,
-      int len)
+      int len) throws IOException {
-          throws IOException {
+    try (FSDataInputStream in1 = fs.open(p1);
-    final FSDataInputStream in1 = fs.open(p1);
+         FSDataInputStream in2 = fs.open(p2)) {
-    final FSDataInputStream in2 = fs.open(p2);
-    try {
       for (int i = 0; i < len; i++) {
         if (in1.read() != in2.read()) {
           return;
         }
       }
       fail("files are equal, but should not be");
-    } finally {
-      in1.close();
-      in2.close();
     }
   }
 
@@ -1699,13 +1674,13 @@ public class DFSTestUtil {
     int ret = 0;
     try {
       ByteArrayOutputStream bs = new ByteArrayOutputStream(1024);
-      PrintStream out = new PrintStream(bs);
+      try (PrintStream out = new PrintStream(bs)) {
-      System.setOut(out);
+        System.setOut(out);
-      System.setErr(out);
+        System.setErr(out);
-      ret = tool.run(cmds);
+        ret = tool.run(cmds);
-      System.out.flush();
+        System.out.flush();
-      System.err.flush();
+        System.err.flush();
-      out.close();
+      }
       output = bs.toString();
     } finally {
       System.setOut(origOut);
@@ -1798,9 +1773,9 @@ public class DFSTestUtil {
       ExtendedBlock blk, int dnIndex, int lenDelta) throws IOException {
     File blockFile = cluster.getBlockFile(dnIndex, blk);
     if (blockFile != null && blockFile.exists()) {
-      RandomAccessFile raFile = new RandomAccessFile(blockFile, "rw");
+      try (RandomAccessFile raFile = new RandomAccessFile(blockFile, "rw")) {
-      raFile.setLength(raFile.length()+lenDelta);
+        raFile.setLength(raFile.length() + lenDelta);
-      raFile.close();
+      }
       return true;
     }
     LOG.info("failed to change length of block " + blk);
@@ -1925,27 +1900,26 @@ public class DFSTestUtil {
       }
     }
 
-    FSDataOutputStream out = null;
+    cluster.getNameNodeRpc()
-    try {
+        .create(file.toString(), new FsPermission((short)0755),
-      out = dfs.create(file, (short) 1); // create an empty file
+        dfs.getClient().getClientName(),
+        new EnumSetWritable<>(EnumSet.of(CreateFlag.CREATE)),
+        false, (short)1, 128*1024*1024L, null);
 
-      FSNamesystem ns = cluster.getNamesystem();
+    FSNamesystem ns = cluster.getNamesystem();
-      FSDirectory fsdir = ns.getFSDirectory();
+    FSDirectory fsdir = ns.getFSDirectory();
-      INodeFile fileNode = fsdir.getINode4Write(file.toString()).asFile();
+    INodeFile fileNode = fsdir.getINode4Write(file.toString()).asFile();
 
-      ExtendedBlock previous = null;
+    ExtendedBlock previous = null;
-      for (int i = 0; i < numBlocks; i++) {
+    for (int i = 0; i < numBlocks; i++) {
-        Block newBlock = addBlockToFile(true, cluster.getDataNodes(), dfs, ns,
+      Block newBlock = addBlockToFile(true, cluster.getDataNodes(), dfs, ns,
-            file.toString(), fileNode, dfs.getClient().getClientName(),
+          file.toString(), fileNode, dfs.getClient().getClientName(),
-            previous, numStripesPerBlk, 0);
+          previous, numStripesPerBlk, 0);
-        previous = new ExtendedBlock(ns.getBlockPoolId(), newBlock);
+      previous = new ExtendedBlock(ns.getBlockPoolId(), newBlock);
-      }
-
-      dfs.getClient().namenode.complete(file.toString(),
-          dfs.getClient().getClientName(), previous, fileNode.getId());
-    } finally {
-      IOUtils.cleanup(null, out);
     }
+
+    dfs.getClient().namenode.complete(file.toString(),
+        dfs.getClient().getClientName(), previous, fileNode.getId());
   }
 
   /**