From d437571fe234f005006f13a312890e52f961e93f Mon Sep 17 00:00:00 2001 From: Steve Vaughan Date: Mon, 13 Feb 2023 09:31:32 -0500 Subject: [PATCH] HDFS-16904. Close webhdfs during TestSymlinkHdfs teardown (#5372) This is a followup to the original patch, 08f58ecf07f, which it supercedes * Switch to org.apache.hadoop.io.IOUtils and closeStream. * Use cleanupWithLogger to include error logging Contributed by Steve Vaughan Jr --- .../test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java index 6bab4af8ad5..43e33ca6afb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java @@ -23,7 +23,6 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.net.URI; -import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hdfs.DFSConfigKeys; @@ -37,12 +36,15 @@ import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.hdfs.web.WebHdfsConstants; import org.apache.hadoop.hdfs.web.WebHdfsFileSystem; import org.apache.hadoop.hdfs.web.WebHdfsTestUtil; +import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.test.GenericTestUtils; import org.apache.log4j.Level; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test symbolic links in Hdfs. @@ -53,6 +55,9 @@ abstract public class TestSymlinkHdfs extends SymlinkBaseTest { GenericTestUtils.setLogLevel(NameNode.stateChangeLog, Level.ALL); } + private static final Logger LOG = LoggerFactory.getLogger( + TestSymlinkHdfs.class); + protected static MiniDFSCluster cluster; protected static WebHdfsFileSystem webhdfs; protected static DistributedFileSystem dfs; @@ -100,7 +105,7 @@ abstract public class TestSymlinkHdfs extends SymlinkBaseTest { if (cluster != null) { cluster.shutdown(); } - IOUtils.closeQuietly(webhdfs); + IOUtils.cleanupWithLogger(LOG, webhdfs); } @Test(timeout=10000)