You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/05/17 23:55:59 UTC
[4/5] hadoop git commit: HDFS-13556. TestNestedEncryptionZones does
not shut down cluster. Contributed by Anbang Hu.
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/6df8fa1b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6df8fa1b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6df8fa1b
Branch: refs/heads/branch-2
Commit: 6df8fa1bc935cf808d510aa0d9dbd1f51972d095
Parents: 315ffd1
Author: Inigo Goiri <in...@apache.org>
Authored: Thu May 17 16:53:23 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Thu May 17 16:55:01 2018 -0700
----------------------------------------------------------------------
.../hdfs/server/namenode/TestNestedEncryptionZones.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6df8fa1b/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org