HDFS-13556. TestNestedEncryptionZones does not shut down cluster. Contributed by Anbang Hu.
(cherry picked from commit a97a2042f210e9db97646baad6f56064d672f447) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ccd7d50f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ccd7d50f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ccd7d50f Branch: refs/heads/branch-3.0 Commit: ccd7d50fafca2ceeb7a384d70d24ae730fde2473 Parents: 6b2d86d Author: Inigo Goiri <inigo...@apache.org> Authored: Thu May 17 16:53:23 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Thu May 17 16:54:17 2018 -0700 ---------------------------------------------------------------------- .../hdfs/server/namenode/TestNestedEncryptionZones.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ccd7d50f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNestedEncryptionZones.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNestedEncryptionZones.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNestedEncryptionZones.java index 59d980c..92187d1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNestedEncryptionZones.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNestedEncryptionZones.java @@ -35,6 +35,7 @@ import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ToolRunner; import org.apache.log4j.Level; import org.apache.log4j.Logger; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -111,6 +112,14 @@ public class TestNestedEncryptionZones { DFSTestUtil.createKey(NESTED_EZ_KEY, cluster, conf); } + @After + public void tearDown() throws Exception { + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } + } + @Test(timeout = 60000) public void testNestedEncryptionZones() throws Exception { initTopEZDirAndNestedEZDir(new Path(rootDir, "topEZ")); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org