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 zj...@apache.org on 2015/05/12 22:49:53 UTC
[36/36] hadoop git commit: YARN-3613. TestContainerManagerSecurity
should init and start Yarn cluster in setup instead of individual methods.
(nijel via kasha)
YARN-3613. TestContainerManagerSecurity should init and start Yarn cluster in setup instead of individual methods. (nijel via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6da88e37
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6da88e37
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6da88e37
Branch: refs/heads/YARN-2928
Commit: 6da88e371a19432878d3eb7cfaf3401507b277a1
Parents: 27746bd
Author: Karthik Kambatla <ka...@apache.org>
Authored: Tue May 12 10:45:33 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Tue May 12 13:44:28 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 ++
.../server/TestContainerManagerSecurity.java | 46 +++++---------------
2 files changed, 15 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6da88e37/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 49c6a78..dce2103 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -303,6 +303,9 @@ Release 2.8.0 - UNRELEASED
YARN-3513. Remove unused variables in ContainersMonitorImpl and add debug
log for overall resource usage by all containers. (Naganarasimha G R via devaraj)
+ YARN-3613. TestContainerManagerSecurity should init and start Yarn cluster in
+ setup instead of individual methods. (nijel via kasha)
+
OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6da88e37/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
index f0dcb56..59bb6aa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
@@ -82,8 +82,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
@RunWith(Parameterized.class)
public class TestContainerManagerSecurity extends KerberosSecurityTestcase {
@@ -105,10 +103,20 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase {
testRootDir.mkdirs();
httpSpnegoKeytabFile.deleteOnExit();
getKdc().createPrincipal(httpSpnegoKeytabFile, httpSpnegoPrincipal);
+
+ yarnCluster =
+ new MiniYARNCluster(TestContainerManagerSecurity.class.getName(), 1, 1,
+ 1);
+ yarnCluster.init(conf);
+ yarnCluster.start();
}
@After
public void tearDown() {
+ if (yarnCluster != null) {
+ yarnCluster.stop();
+ yarnCluster = null;
+ }
testRootDir.delete();
}
@@ -144,11 +152,6 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase {
@Test (timeout = 120000)
public void testContainerManager() throws Exception {
- try {
- yarnCluster = new MiniYARNCluster(TestContainerManagerSecurity.class
- .getName(), 1, 1, 1);
- yarnCluster.init(conf);
- yarnCluster.start();
// TestNMTokens.
testNMTokens(conf);
@@ -156,36 +159,11 @@ public class TestContainerManagerSecurity extends KerberosSecurityTestcase {
// Testing for container token tampering
testContainerToken(conf);
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
- } finally {
- if (yarnCluster != null) {
- yarnCluster.stop();
- yarnCluster = null;
- }
- }
- }
-
- @Test (timeout = 120000)
- public void testContainerManagerWithEpoch() throws Exception {
- try {
- yarnCluster = new MiniYARNCluster(TestContainerManagerSecurity.class
- .getName(), 1, 1, 1);
- yarnCluster.init(conf);
- yarnCluster.start();
-
- // Testing for container token tampering
+ // Testing for container token tampering with epoch
testContainerTokenWithEpoch(conf);
- } finally {
- if (yarnCluster != null) {
- yarnCluster.stop();
- yarnCluster = null;
- }
- }
}
-
+
private void testNMTokens(Configuration conf) throws Exception {
NMTokenSecretManagerInRM nmTokenSecretManagerRM =
yarnCluster.getResourceManager().getRMContext()