Repository: hadoop
Updated Branches:
refs/heads/branch-2 0ad613c36 -> 3746b1e90
YARN-2558. Updated ContainerTokenIdentifier#read/write to use
ContainerId#getContainerId. Contributed by Tsuyoshi OZAWA.
(cherry picked from commit f4886111aa573ec928de69e8ca9328d480bf673e)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3746b1e9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3746b1e9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3746b1e9
Branch: refs/heads/branch-2
Commit: 3746b1e9053cf73ae1b6edc8d7aa0c4b38496fce
Parents: 0ad613c
Author: Jian He <[email protected]>
Authored: Wed Sep 17 15:12:17 2014 -0700
Committer: Jian He <[email protected]>
Committed: Wed Sep 17 15:22:02 2014 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 7 +-
.../yarn/security/ContainerTokenIdentifier.java | 4 +-
.../server/TestContainerManagerSecurity.java | 92 ++++++++++++++++++++
3 files changed, 99 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3746b1e9/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f9acfc6..7d7eea0 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -202,6 +202,9 @@ Release 2.6.0 - UNRELEASED
YARN-2547. Cross Origin Filter throws UnsupportedOperationException upon
destroy (Mit Desai via jeagles)
+ YARN-2557. Add a parameter "attempt_Failures_Validity_Interval" into
+ DistributedShell. (xgong)
+
OPTIMIZATIONS
BUG FIXES
@@ -344,8 +347,8 @@ Release 2.6.0 - UNRELEASED
YARN-2529. Generic history service RPC interface doesn't work when service
authorization is enabled. (Zhijie Shen via jianhe)
- YARN-2557. Add a parameter "attempt_Failures_Validity_Interval" into
- DistributedShell. (xgong)
+ YARN-2558. Updated ContainerTokenIdentifier#read/write to use
+ ContainerId#getContainerId. (Tsuyoshi OZAWA via jianhe)
Release 2.5.1 - 2014-09-05
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3746b1e9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
index 8b8177a..ca847e0 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenIdentifier.java
@@ -128,7 +128,7 @@ public class ContainerTokenIdentifier extends
TokenIdentifier {
out.writeLong(applicationId.getClusterTimestamp());
out.writeInt(applicationId.getId());
out.writeInt(applicationAttemptId.getAttemptId());
- out.writeInt(this.containerId.getId());
+ out.writeLong(this.containerId.getContainerId());
out.writeUTF(this.nmHostAddr);
out.writeUTF(this.appSubmitter);
out.writeInt(this.resource.getMemory());
@@ -147,7 +147,7 @@ public class ContainerTokenIdentifier extends
TokenIdentifier {
ApplicationAttemptId applicationAttemptId =
ApplicationAttemptId.newInstance(applicationId, in.readInt());
this.containerId =
- ContainerId.newInstance(applicationAttemptId, in.readInt());
+ ContainerId.newInstance(applicationAttemptId, in.readLong());
this.nmHostAddr = in.readUTF();
this.appSubmitter = in.readUTF();
int memory = in.readInt();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3746b1e9/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 6797165..9bb44ca 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
@@ -28,6 +28,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import java.util.LinkedList;
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteStreams;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -158,6 +161,25 @@ public class TestContainerManagerSecurity extends
KerberosSecurityTestcase {
}
}
}
+
+ @Test (timeout = 500000)
+ 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
+ testContainerTokenWithEpoch(conf);
+
+ } finally {
+ if (yarnCluster != null) {
+ yarnCluster.stop();
+ yarnCluster = null;
+ }
+ }
+ }
private void testNMTokens(Configuration conf) throws Exception {
NMTokenSecretManagerInRM nmTokenSecretManagerRM =
@@ -603,4 +625,74 @@ public class TestContainerManagerSecurity extends
KerberosSecurityTestcase {
Assert.assertTrue(testStartContainer(rpc, appAttemptId, nodeId,
containerToken, nmToken, true).contains(sb.toString()));
}
+
+ /**
+ * This tests whether a containerId is serialized/deserialized with epoch.
+ *
+ * @throws IOException
+ * @throws InterruptedException
+ * @throws YarnException
+ */
+ private void testContainerTokenWithEpoch(Configuration conf)
+ throws IOException, InterruptedException, YarnException {
+
+ LOG.info("Running test for serializing/deserializing containerIds");
+
+ NMTokenSecretManagerInRM nmTokenSecretManagerInRM =
+ yarnCluster.getResourceManager().getRMContext()
+ .getNMTokenSecretManager();
+ ApplicationId appId = ApplicationId.newInstance(1, 1);
+ ApplicationAttemptId appAttemptId =
+ ApplicationAttemptId.newInstance(appId, 0);
+ ContainerId cId = ContainerId.newInstance(appAttemptId, (5L << 40) | 3L);
+ NodeManager nm = yarnCluster.getNodeManager(0);
+ NMTokenSecretManagerInNM nmTokenSecretManagerInNM =
+ nm.getNMContext().getNMTokenSecretManager();
+ String user = "test";
+
+ waitForNMToReceiveNMTokenKey(nmTokenSecretManagerInNM, nm);
+
+ NodeId nodeId = nm.getNMContext().getNodeId();
+
+ // Both id should be equal.
+ Assert.assertEquals(nmTokenSecretManagerInNM.getCurrentKey().getKeyId(),
+ nmTokenSecretManagerInRM.getCurrentKey().getKeyId());
+
+ // Creating a normal Container Token
+ RMContainerTokenSecretManager containerTokenSecretManager =
+ yarnCluster.getResourceManager().getRMContext().
+ getContainerTokenSecretManager();
+ Resource r = Resource.newInstance(1230, 2);
+ Token containerToken =
+ containerTokenSecretManager.createContainerToken(cId, nodeId, user, r,
+ Priority.newInstance(0), 0);
+
+ ByteArrayDataInput input = ByteStreams.newDataInput(
+ containerToken.getIdentifier().array());
+ ContainerTokenIdentifier containerTokenIdentifier =
+ new ContainerTokenIdentifier();
+ containerTokenIdentifier.readFields(input);
+ Assert.assertEquals(cId, containerTokenIdentifier.getContainerID());
+ Assert.assertEquals(
+ cId.toString(), containerTokenIdentifier.getContainerID().toString());
+
+ Token nmToken =
+ nmTokenSecretManagerInRM.createNMToken(appAttemptId, nodeId, user);
+
+ YarnRPC rpc = YarnRPC.create(conf);
+ testStartContainer(rpc, appAttemptId, nodeId, containerToken, nmToken,
+ false);
+
+ List<ContainerId> containerIds = new LinkedList<ContainerId>();
+ containerIds.add(cId);
+ ContainerManagementProtocol proxy
+ = getContainerManagementProtocolProxy(rpc, nmToken, nodeId, user);
+ GetContainerStatusesResponse res = proxy.getContainerStatuses(
+ GetContainerStatusesRequest.newInstance(containerIds));
+ Assert.assertNotNull(res.getContainerStatuses().get(0));
+ Assert.assertEquals(
+ cId, res.getContainerStatuses().get(0).getContainerId());
+ Assert.assertEquals(cId.toString(),
+ res.getContainerStatuses().get(0).getContainerId().toString());
+ }
}
