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:56 UTC
[1/5] hadoop git commit: HDFS-13556. TestNestedEncryptionZones does
not shut down cluster. Contributed by Anbang Hu.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 315ffd1ad -> 6df8fa1bc
refs/heads/branch-2.9 424812db6 -> 4795efc83
refs/heads/branch-3.0 6b2d86deb -> ccd7d50fa
refs/heads/branch-3.1 8c463a2a9 -> f67865ed7
refs/heads/trunk 7c485a670 -> a97a2042f
HDFS-13556. TestNestedEncryptionZones does not shut down cluster. Contributed by Anbang Hu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a97a2042
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a97a2042
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a97a2042
Branch: refs/heads/trunk
Commit: a97a2042f210e9db97646baad6f56064d672f447
Parents: 7c485a6
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:53:23 2018 -0700
----------------------------------------------------------------------
.../hdfs/server/namenode/TestNestedEncryptionZones.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a97a2042/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
[5/5] hadoop git commit: HDFS-13556. TestNestedEncryptionZones does
not shut down cluster. Contributed by Anbang Hu.
Posted by in...@apache.org.
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/4795efc8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4795efc8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4795efc8
Branch: refs/heads/branch-2.9
Commit: 4795efc831a4e388ee65d3c9ea6c09ed0d1bf863
Parents: 424812d
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:19 2018 -0700
----------------------------------------------------------------------
.../hdfs/server/namenode/TestNestedEncryptionZones.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4795efc8/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
[2/5] hadoop git commit: HDFS-13556. TestNestedEncryptionZones does
not shut down cluster. Contributed by Anbang Hu.
Posted by in...@apache.org.
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/f67865ed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f67865ed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f67865ed
Branch: refs/heads/branch-3.1
Commit: f67865ed7e1fb4265c98f9e605ff52b4815fa75a
Parents: 8c463a2
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:53:53 2018 -0700
----------------------------------------------------------------------
.../hdfs/server/namenode/TestNestedEncryptionZones.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f67865ed/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
[3/5] hadoop git commit: HDFS-13556. TestNestedEncryptionZones does
not shut down cluster. Contributed by Anbang Hu.
Posted by in...@apache.org.
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 <in...@apache.org>
Authored: Thu May 17 16:53:23 2018 -0700
Committer: Inigo Goiri <in...@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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HDFS-13556. TestNestedEncryptionZones does
not shut down cluster. Contributed by Anbang Hu.
Posted by in...@apache.org.
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