Return-Path: X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 76B85FFB0 for ; Fri, 31 May 2013 04:13:48 +0000 (UTC) Received: (qmail 8471 invoked by uid 500); 31 May 2013 04:13:47 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 8354 invoked by uid 500); 31 May 2013 04:13:46 -0000 Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: yarn-commits@hadoop.apache.org Delivered-To: mailing list yarn-commits@hadoop.apache.org Received: (qmail 8336 invoked by uid 99); 31 May 2013 04:13:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 May 2013 04:13:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 May 2013 04:13:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A855023889E0; Fri, 31 May 2013 04:13:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488085 [2/3] - in /hadoop/common/trunk/hadoop-yarn-project: ./ hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/ hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl... Date: Fri, 31 May 2013 04:13:18 -0000 To: yarn-commits@hadoop.apache.org From: sseth@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130531041320.A855023889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java Fri May 31 04:13:16 2013 @@ -34,6 +34,7 @@ import java.util.LinkedList; import java.util.List; import junit.framework.Assert; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -108,10 +109,7 @@ public class TestLinuxContainerExecutorW ContainerLaunchContext context = mock(ContainerLaunchContext.class); HashMap env = new HashMap(); - org.apache.hadoop.yarn.api.records.Container containerAPI = - mock(org.apache.hadoop.yarn.api.records.Container.class); - when(container.getContainer()).thenReturn(containerAPI); - when(container.getContainer().getId()).thenReturn(cId); + when(container.getContainerId()).thenReturn(cId); when(container.getLaunchContext()).thenReturn(context); when(cId.toString()).thenReturn(containerId); @@ -229,10 +227,7 @@ public class TestLinuxContainerExecutorW ContainerLaunchContext context = mock(ContainerLaunchContext.class); HashMap env = new HashMap(); - org.apache.hadoop.yarn.api.records.Container containerAPI = - mock(org.apache.hadoop.yarn.api.records.Container.class); - when(container.getContainer()).thenReturn(containerAPI); - when(container.getContainer().getId()).thenReturn(cId); + when(container.getContainerId()).thenReturn(cId); when(container.getLaunchContext()).thenReturn(context); when(cId.toString()).thenReturn(containerId); Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java Fri May 31 04:13:16 2013 @@ -112,9 +112,6 @@ public class TestNodeManagerReboot { Records.newRecord(ContainerLaunchContext.class); // Construct the Container-id ContainerId cId = createContainerId(); - org.apache.hadoop.yarn.api.records.Container mockContainer = - Records.newRecord(org.apache.hadoop.yarn.api.records.Container.class); - mockContainer.setId(cId); URL localResourceUri = ConverterUtils.getYarnUrlFromPath(localFS @@ -136,20 +133,16 @@ public class TestNodeManagerReboot { containerLaunchContext.setCommands(commands); Resource resource = Records.newRecord(Resource.class); resource.setMemory(1024); - mockContainer.setResource(resource); NodeId nodeId = BuilderUtils.newNodeId("127.0.0.1", 12345); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, nodeId.getHost(), nodeId.getPort(), user, resource, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), 0); - mockContainer.setContainerToken(containerToken); - mockContainer.setNodeHttpAddress("127.0.0.1"); - mockContainer.setNodeId(nodeId); final StartContainerRequest startRequest = Records.newRecord(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); final UserGroupInformation currentUser = UserGroupInformation .createRemoteUser(cId.toString()); currentUser.doAs(new PrivilegedExceptionAction() { Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerResync.java Fri May 31 04:13:16 2013 @@ -31,7 +31,6 @@ import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.UnsupportedFileSystemException; import org.apache.hadoop.yarn.api.protocolrecords.StartContainerRequest; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.conf.YarnConfiguration; @@ -43,7 +42,6 @@ import org.apache.hadoop.yarn.server.nod import org.apache.hadoop.yarn.server.nodemanager.containermanager.NMNotYetReadyException; import org.apache.hadoop.yarn.server.nodemanager.metrics.NodeManagerMetrics; import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; -import org.apache.hadoop.yarn.util.BuilderUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -281,12 +279,10 @@ public class TestNodeManagerResync { try { while (!isStopped && numContainers < 10) { ContainerId cId = TestNodeManagerShutdown.createContainerId(); - Container container = - BuilderUtils.newContainer(cId, null, null, null, null, null); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(container); + startRequest.setContainerToken(null); System.out.println("no. of containers to be launched: " + numContainers); numContainers++; Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java Fri May 31 04:13:16 2013 @@ -44,7 +44,6 @@ import org.apache.hadoop.yarn.api.protoc import org.apache.hadoop.yarn.api.protocolrecords.StartContainerRequest; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -56,7 +55,6 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.URL; -import org.apache.hadoop.yarn.api.records.impl.pb.ContainerPBImpl; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; @@ -158,13 +156,8 @@ public class TestNodeManagerShutdown { ContainerLaunchContext containerLaunchContext = recordFactory.newRecordInstance(ContainerLaunchContext.class); - Container mockContainer = new ContainerPBImpl(); - - mockContainer.setId(cId); NodeId nodeId = BuilderUtils.newNodeId("localhost", 1234); - mockContainer.setNodeId(nodeId); - mockContainer.setNodeHttpAddress("localhost:12345"); URL localResourceUri = ConverterUtils.getYarnUrlFromPath(localFS @@ -184,16 +177,14 @@ public class TestNodeManagerShutdown { List commands = Arrays.asList(Shell.getRunScriptCommand(scriptFile)); containerLaunchContext.setCommands(commands); Resource resource = BuilderUtils.newResource(1024, 1); - mockContainer.setResource(resource); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, nodeId.getHost(), nodeId.getPort(), user, resource, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), 0); - mockContainer.setContainerToken(containerToken); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); UserGroupInformation currentUser = UserGroupInformation .createRemoteUser(cId.toString()); Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java Fri May 31 04:13:16 2013 @@ -58,6 +58,7 @@ import org.apache.hadoop.yarn.exceptions import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.RPCUtil; +import org.apache.hadoop.yarn.security.ContainerTokenIdentifier; import org.apache.hadoop.yarn.server.api.ResourceTracker; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatRequest; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; @@ -187,8 +188,6 @@ public class TestNodeStatusUpdater { nodeStatus.setResponseId(heartBeatID++); Map> appToContainers = getAppToContainerStatusMap(nodeStatus.getContainersStatuses()); - org.apache.hadoop.yarn.api.records.Container mockContainer = - mock(org.apache.hadoop.yarn.api.records.Container.class); ApplicationId appId1 = ApplicationId.newInstance(0, 1); ApplicationId appId2 = ApplicationId.newInstance(0, 2); @@ -202,12 +201,17 @@ public class TestNodeStatusUpdater { firstContainerID.setId(heartBeatID); ContainerLaunchContext launchContext = recordFactory .newRecordInstance(ContainerLaunchContext.class); - when(mockContainer.getId()).thenReturn(firstContainerID); Resource resource = BuilderUtils.newResource(2, 1); - when(mockContainer.getResource()).thenReturn(resource); + long currentTime = System.currentTimeMillis(); + String user = "testUser"; + ContainerTokenIdentifier containerToken = + BuilderUtils.newContainerTokenIdentifier(BuilderUtils + .newContainerToken(firstContainerID, "127.0.0.1", 1234, user, + resource, currentTime + 10000, 123, "password".getBytes(), + currentTime)); Container container = - new ContainerImpl(conf, mockDispatcher, launchContext, - mockContainer, null, mockMetrics, null); + new ContainerImpl(conf, mockDispatcher, launchContext, null, + mockMetrics, containerToken); this.context.getContainers().put(firstContainerID, container); } else if (heartBeatID == 2) { // Checks on the RM end @@ -227,12 +231,17 @@ public class TestNodeStatusUpdater { secondContainerID.setId(heartBeatID); ContainerLaunchContext launchContext = recordFactory .newRecordInstance(ContainerLaunchContext.class); - when(mockContainer.getId()).thenReturn(secondContainerID); + long currentTime = System.currentTimeMillis(); + String user = "testUser"; Resource resource = BuilderUtils.newResource(3, 1); - when(mockContainer.getResource()).thenReturn(resource); + ContainerTokenIdentifier containerToken = + BuilderUtils.newContainerTokenIdentifier(BuilderUtils + .newContainerToken(secondContainerID, "127.0.0.1", 1234, user, + resource, currentTime + 10000, 123, + "password".getBytes(), currentTime)); Container container = - new ContainerImpl(conf, mockDispatcher, launchContext, - mockContainer, null, mockMetrics, null); + new ContainerImpl(conf, mockDispatcher, launchContext, null, + mockMetrics, containerToken); this.context.getContainers().put(secondContainerID, container); } else if (heartBeatID == 3) { // Checks on the RM end Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java Fri May 31 04:13:16 2013 @@ -33,7 +33,6 @@ import org.apache.hadoop.security.UserGr import org.apache.hadoop.yarn.api.ContainerManager; import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusRequest; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -94,9 +93,14 @@ public abstract class BaseContainerManag protected static Log LOG = LogFactory .getLog(BaseContainerManagerTest.class); + protected static final int HTTP_PORT = 5412; protected Configuration conf = new YarnConfiguration(); protected Context context = new NMContext(new NMContainerTokenSecretManager( - conf)); + conf)) { + public int getHttpPort() { + return HTTP_PORT; + }; + }; protected ContainerExecutor exec; protected DeletionService delSrvc; protected String user = "nobody"; @@ -177,9 +181,8 @@ public abstract class BaseContainerManag @Override protected void authorizeRequest(String containerIDStr, - ContainerLaunchContext launchContext, Container container, - UserGroupInformation remoteUgi, ContainerTokenIdentifier tokenId) - throws YarnRemoteException { + ContainerLaunchContext launchContext, UserGroupInformation remoteUgi, + ContainerTokenIdentifier tokenId) throws YarnRemoteException { // do nothing } }; Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java Fri May 31 04:13:16 2013 @@ -18,9 +18,6 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -43,7 +40,6 @@ import org.apache.hadoop.yarn.api.protoc import org.apache.hadoop.yarn.api.protocolrecords.StopContainerRequest; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -142,24 +138,16 @@ public class TestContainerManager extend new HashMap(); localResources.put(destinationFile, rsrc_alpha); containerLaunchContext.setLocalResources(localResources); - Container mockContainer = mock(Container.class); - when(mockContainer.getId()).thenReturn(cId); Resource r = BuilderUtils.newResource(512, 1); - when(mockContainer.getResource()).thenReturn(r); - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); int port = 12345; - when(mockContainer.getNodeHttpAddress()).thenReturn( - context.getNodeId().getHost() + ":" + port); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, context.getNodeId().getHost(), port, user, r, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer.getContainerToken()).thenReturn(containerToken); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); containerManager.startContainer(startRequest); @@ -243,23 +231,16 @@ public class TestContainerManager extend containerLaunchContext.setLocalResources(localResources); List commands = Arrays.asList(Shell.getRunScriptCommand(scriptFile)); containerLaunchContext.setCommands(commands); - Container mockContainer = mock(Container.class); - when(mockContainer.getId()).thenReturn(cId); Resource r = BuilderUtils.newResource(100, 1); - when(mockContainer.getResource()).thenReturn(r); // MB - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); int port = 12345; - when(mockContainer.getNodeHttpAddress()).thenReturn( - context.getNodeId().getHost() + ":" + port); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, context.getNodeId().getHost(), port, user, r, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer.getContainerToken()).thenReturn(containerToken); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); containerManager.startContainer(startRequest); int timeoutSecs = 0; @@ -358,22 +339,15 @@ public class TestContainerManager extend containerLaunchContext.setLocalResources(localResources); List commands = Arrays.asList(Shell.getRunScriptCommand(scriptFile)); containerLaunchContext.setCommands(commands); - Container mockContainer = mock(Container.class); - when(mockContainer.getId()).thenReturn(cId); Resource r = BuilderUtils.newResource(100, 1); - when(mockContainer.getResource()).thenReturn(r); // MB int port = 12345; - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); - when(mockContainer.getNodeHttpAddress()).thenReturn( - context.getNodeId().getHost() + ":" + port); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, context.getNodeId().getHost(), port, user, r, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer.getContainerToken()).thenReturn(containerToken); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); containerManager.startContainer(startRequest); BaseContainerManagerTest.waitForContainerState(containerManager, cId, @@ -453,24 +427,16 @@ public class TestContainerManager extend new HashMap(); localResources.put(destinationFile, rsrc_alpha); containerLaunchContext.setLocalResources(localResources); - Container mockContainer = mock(Container.class); - when(mockContainer.getId()).thenReturn(cId); Resource r = BuilderUtils.newResource(100, 1); - when(mockContainer.getResource()).thenReturn(r); - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); int port = 12345; - when(mockContainer.getNodeHttpAddress()).thenReturn( - context.getNodeId().getHost() + ":" + port); -// containerLaunchContext.command = new ArrayList(); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, context.getNodeId().getHost(), port, user, r, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer.getContainerToken()).thenReturn(containerToken); StartContainerRequest request = recordFactory.newRecordInstance(StartContainerRequest.class); request.setContainerLaunchContext(containerLaunchContext); - request.setContainer(mockContainer); + request.setContainerToken(containerToken); containerManager.startContainer(request); BaseContainerManagerTest.waitForContainerState(containerManager, cId, @@ -549,8 +515,6 @@ public class TestContainerManager extend .setLocalResources(new HashMap()); Resource mockResource = BuilderUtils.newResource(1024, 1); - Container mockContainer1 = mock(Container.class); - when(mockContainer1.getId()).thenReturn(cId1); // Construct the Container with Invalid RMIdentifier StartContainerRequest startRequest1 = recordFactory.newRecordInstance(StartContainerRequest.class); @@ -560,8 +524,7 @@ public class TestContainerManager extend BuilderUtils.newContainerToken(cId1, host, port, user, mockResource, System.currentTimeMillis() + 10000, 123, "password".getBytes(), (long) ResourceManagerConstants.RM_INVALID_IDENTIFIER); - when(mockContainer1.getContainerToken()).thenReturn(containerToken1); - startRequest1.setContainer(mockContainer1); + startRequest1.setContainerToken(containerToken1); boolean catchException = false; try { containerManager.startContainer(startRequest1); @@ -579,10 +542,6 @@ public class TestContainerManager extend Assert.assertTrue(catchException); // Construct the Container with a RMIdentifier within current RM - Container mockContainer2 = mock(Container.class); - when(mockContainer2.getId()).thenReturn(cId2); - - when(mockContainer2.getResource()).thenReturn(mockResource); StartContainerRequest startRequest2 = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest2.setContainerLaunchContext(containerLaunchContext); @@ -590,9 +549,7 @@ public class TestContainerManager extend BuilderUtils.newContainerToken(cId1, host, port, user, mockResource, System.currentTimeMillis() + 10000, 123, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer2.getContainerToken()).thenReturn(containerToken2); - - startRequest2.setContainer(mockContainer2); + startRequest2.setContainerToken(containerToken2); boolean noException = true; try { containerManager.startContainer(startRequest2); Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java Fri May 31 04:13:16 2013 @@ -91,7 +91,7 @@ public class TestApplication { for (int i = 0; i < wa.containers.size(); i++) { verify(wa.containerBus).handle( argThat(new ContainerInitMatcher(wa.containers.get(i) - .getContainer().getId()))); + .getContainerId()))); } } finally { if (wa != null) @@ -116,7 +116,7 @@ public class TestApplication { assertEquals(ApplicationState.RUNNING, wa.app.getApplicationState()); verify(wa.containerBus).handle( argThat(new ContainerInitMatcher(wa.containers.get(0) - .getContainer().getId()))); + .getContainerId()))); wa.initContainer(1); wa.initContainer(2); @@ -126,7 +126,7 @@ public class TestApplication { for (int i = 1; i < wa.containers.size(); i++) { verify(wa.containerBus).handle( argThat(new ContainerInitMatcher(wa.containers.get(i) - .getContainer().getId()))); + .getContainerId()))); } } finally { if (wa != null) @@ -241,7 +241,7 @@ public class TestApplication { for (int i = 1; i < wa.containers.size(); i++) { verify(wa.containerBus).handle( argThat(new ContainerKillMatcher(wa.containers.get(i) - .getContainer().getId()))); + .getContainerId()))); } wa.containerFinished(1); @@ -267,7 +267,7 @@ public class TestApplication { wa.appResourcesCleanedup(); for ( Container container : wa.containers) { Assert.assertTrue(wa.context.getContainerTokenSecretManager() - .isValidStartContainerRequest(container.getContainer().getId())); + .isValidStartContainerRequest(container.getContainerId())); } assertEquals(ApplicationState.FINISHED, wa.app.getApplicationState()); @@ -307,7 +307,7 @@ public class TestApplication { wa.appResourcesCleanedup(); for ( Container container : wa.containers) { Assert.assertTrue(wa.context.getContainerTokenSecretManager() - .isValidStartContainerRequest(container.getContainer().getId())); + .isValidStartContainerRequest(container.getContainerId())); } assertEquals(ApplicationState.FINISHED, wa.app.getApplicationState()); } finally { @@ -370,7 +370,7 @@ public class TestApplication { verify(wa.containerBus).handle( argThat(new ContainerKillMatcher(wa.containers.get(0) - .getContainer().getId()))); + .getContainerId()))); assertEquals(ApplicationState.FINISHING_CONTAINERS_WAIT, wa.app.getApplicationState()); @@ -487,10 +487,10 @@ public class TestApplication { containers.add(container); long currentTime = System.currentTimeMillis(); context.getContainerTokenSecretManager().startContainerSuccessful( - new ContainerTokenIdentifier(container.getContainer().getId(), "", + new ContainerTokenIdentifier(container.getContainerId(), "", "", null, currentTime + 1000, masterKey.getKeyId(), currentTime)); Assert.assertFalse(context.getContainerTokenSecretManager() - .isValidStartContainerRequest(container.getContainer().getId())); + .isValidStartContainerRequest(container.getContainerId())); } dispatcher.start(); @@ -522,7 +522,7 @@ public class TestApplication { public void containerFinished(int containerNum) { app.handle(new ApplicationContainerFinishedEvent(containers.get( - containerNum).getContainer().getId())); + containerNum).getContainerId())); drainDispatcherEvents(); } @@ -549,10 +549,7 @@ public class TestApplication { BuilderUtils.newApplicationAttemptId(appId, 1); ContainerId cId = BuilderUtils.newContainerId(appAttemptId, containerId); Container c = mock(Container.class); - org.apache.hadoop.yarn.api.records.Container containerAPI = - mock(org.apache.hadoop.yarn.api.records.Container.class); - when(c.getContainer()).thenReturn(containerAPI); - when(c.getContainer().getId()).thenReturn(cId); + when(c.getContainerId()).thenReturn(cId); ContainerLaunchContext launchContext = mock(ContainerLaunchContext.class); when(c.getLaunchContext()).thenReturn(launchContext); when(launchContext.getApplicationACLs()).thenReturn( Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java Fri May 31 04:13:16 2013 @@ -52,7 +52,6 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.URL; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.event.DrainDispatcher; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.security.ContainerTokenIdentifier; @@ -377,7 +376,7 @@ public class TestContainer { public boolean matches(Object o) { ContainersLauncherEvent evt = (ContainersLauncherEvent) o; return evt.getType() == ContainersLauncherEventType.LAUNCH_CONTAINER - && wcf.cId == evt.getContainer().getContainer().getId(); + && wcf.cId == evt.getContainer().getContainerId(); } }; verify(wc.launcherBus).handle(argThat(matchesLaunchReq)); @@ -526,13 +525,6 @@ public class TestContainer { return serviceData; } - private Container newContainer(Dispatcher disp, ContainerLaunchContext ctx, - org.apache.hadoop.yarn.api.records.Container container, - ContainerTokenIdentifier identifier) throws IOException { - return new ContainerImpl(conf, disp, ctx, container, null, metrics, - identifier); - } - @SuppressWarnings("unchecked") private class WrappedContainer { final DrainDispatcher dispatcher; @@ -612,7 +604,7 @@ public class TestContainer { } when(ctxt.getServiceData()).thenReturn(serviceData); - c = newContainer(dispatcher, ctxt, mockContainer, identifier); + c = new ContainerImpl(conf, dispatcher, ctxt, null, metrics, identifier); dispatcher.start(); } @@ -649,7 +641,7 @@ public class TestContainer { Path p = new Path(cache, rsrc.getKey()); localPaths.put(p, Arrays.asList(rsrc.getKey())); // rsrc copied to p - c.handle(new ContainerResourceLocalizedEvent(c.getContainer().getId(), + c.handle(new ContainerResourceLocalizedEvent(c.getContainerId(), req, p)); } drainDispatcherEvents(); @@ -672,8 +664,8 @@ public class TestContainer { LocalResource rsrc = localResources.get(rsrcKey); LocalResourceRequest req = new LocalResourceRequest(rsrc); Exception e = new Exception("Fake localization error"); - c.handle(new ContainerResourceFailedEvent(c.getContainer() - .getId(), req, e.getMessage())); + c.handle(new ContainerResourceFailedEvent(c.getContainerId(), req, e + .getMessage())); drainDispatcherEvents(); } @@ -688,7 +680,7 @@ public class TestContainer { ++counter; LocalResourceRequest req = new LocalResourceRequest(rsrc.getValue()); Exception e = new Exception("Fake localization error"); - c.handle(new ContainerResourceFailedEvent(c.getContainer().getId(), + c.handle(new ContainerResourceFailedEvent(c.getContainerId(), req, e.getMessage())); } drainDispatcherEvents(); Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java Fri May 31 04:13:16 2013 @@ -19,8 +19,6 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import java.io.BufferedReader; import java.io.File; @@ -47,7 +45,6 @@ import org.apache.hadoop.yarn.api.protoc import org.apache.hadoop.yarn.api.protocolrecords.StopContainerRequest; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -163,7 +160,6 @@ public class TestContainerLaunch extends ContainerLaunchContext containerLaunchContext = recordFactory.newRecordInstance(ContainerLaunchContext.class); - Container mockContainer = mock(Container.class); // ////// Construct the Container-id ApplicationId appId = ApplicationId.newInstance(0, 0); ApplicationAttemptId appAttemptId = @@ -174,11 +170,6 @@ public class TestContainerLaunch extends recordFactory.newRecordInstance(ContainerId.class); int port = 12345; cId.setApplicationAttemptId(appAttemptId); - when(mockContainer.getId()).thenReturn(cId); - - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); - when(mockContainer.getNodeHttpAddress()).thenReturn( - context.getNodeId().getHost() + ":" + port); Map userSetEnv = new HashMap(); userSetEnv.put(Environment.CONTAINER_ID.name(), "user_set_container_id"); @@ -242,15 +233,13 @@ public class TestContainerLaunch extends List commands = Arrays.asList(Shell.getRunScriptCommand(scriptFile)); containerLaunchContext.setCommands(commands); Resource r = BuilderUtils.newResource(1024, 1); - when(mockContainer.getResource()).thenReturn(r); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, context.getNodeId().getHost(), port, user, r, System.currentTimeMillis() + 10000L, 1234, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer.getContainerToken()).thenReturn(containerToken); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); containerManager.startContainer(startRequest); int timeoutSecs = 0; @@ -273,27 +262,20 @@ public class TestContainerLaunch extends BufferedReader reader = new BufferedReader(new FileReader(processStartFile)); Assert.assertEquals(cId.toString(), reader.readLine()); - Assert.assertEquals(mockContainer.getNodeId().getHost(), - reader.readLine()); - Assert.assertEquals(String.valueOf(mockContainer.getNodeId().getPort()), - reader.readLine()); - Assert.assertEquals( - String.valueOf(mockContainer.getNodeHttpAddress().split(":")[1]), - reader.readLine()); + Assert.assertEquals(context.getNodeId().getHost(), reader.readLine()); + Assert.assertEquals(String.valueOf(context.getNodeId().getPort()), + reader.readLine()); + Assert.assertEquals(String.valueOf(HTTP_PORT), reader.readLine()); Assert.assertEquals(StringUtils.join(",", appDirs), reader.readLine()); Assert.assertEquals(cId.toString(), containerLaunchContext .getEnvironment().get(Environment.CONTAINER_ID.name())); - Assert.assertEquals(mockContainer.getNodeId().getHost(), - containerLaunchContext.getEnvironment() - .get(Environment.NM_HOST.name())); - Assert.assertEquals(String.valueOf(mockContainer.getNodeId().getPort()), - containerLaunchContext.getEnvironment().get( - Environment.NM_PORT.name())); - Assert.assertEquals( - mockContainer.getNodeHttpAddress().split(":")[1], - containerLaunchContext.getEnvironment().get( - Environment.NM_HTTP_PORT.name())); + Assert.assertEquals(context.getNodeId().getHost(), containerLaunchContext + .getEnvironment().get(Environment.NM_HOST.name())); + Assert.assertEquals(String.valueOf(context.getNodeId().getPort()), + containerLaunchContext.getEnvironment().get(Environment.NM_PORT.name())); + Assert.assertEquals(String.valueOf(HTTP_PORT), containerLaunchContext + .getEnvironment().get(Environment.NM_HTTP_PORT.name())); Assert.assertEquals(StringUtils.join(",", appDirs), containerLaunchContext .getEnvironment().get(Environment.LOCAL_DIRS.name())); // Get the pid of the process @@ -335,7 +317,6 @@ public class TestContainerLaunch extends public void testDelayedKill() throws Exception { containerManager.start(); - Container mockContainer = mock(Container.class); // ////// Construct the Container-id ApplicationId appId = ApplicationId.newInstance(1, 1); ApplicationAttemptId appAttemptId = @@ -372,11 +353,7 @@ public class TestContainerLaunch extends ContainerLaunchContext containerLaunchContext = recordFactory.newRecordInstance(ContainerLaunchContext.class); - when(mockContainer.getId()).thenReturn(cId); - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); int port = 12345; - when(mockContainer.getNodeHttpAddress()).thenReturn( - context.getNodeId().getHost() + ":" + port); // upload the script file so that the container can run it URL resource_alpha = @@ -399,15 +376,13 @@ public class TestContainerLaunch extends List commands = Arrays.asList(Shell.getRunScriptCommand(scriptFile)); containerLaunchContext.setCommands(commands); Resource r = BuilderUtils.newResource(1024, 1); - when(mockContainer.getResource()).thenReturn(r); ContainerToken containerToken = BuilderUtils.newContainerToken(cId, context.getNodeId().getHost(), port, user, r, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer.getContainerToken()).thenReturn(containerToken); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); containerManager.startContainer(startRequest); int timeoutSecs = 0; Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java Fri May 31 04:13:16 2013 @@ -495,7 +495,7 @@ public class TestResourceLocalizationSer Thread.sleep(1000); dispatcher.await(); String appStr = ConverterUtils.toString(appId); - String ctnrStr = c.getContainer().getId().toString(); + String ctnrStr = c.getContainerId().toString(); ArgumentCaptor tokenPathCaptor = ArgumentCaptor.forClass(Path.class); verify(exec).startLocalizer(tokenPathCaptor.capture(), isA(InetSocketAddress.class), eq("user0"), eq(appStr), eq(ctnrStr), @@ -571,7 +571,7 @@ public class TestResourceLocalizationSer public boolean matches(Object o) { ContainerEvent evt = (ContainerEvent) o; return evt.getType() == ContainerEventType.RESOURCE_LOCALIZED - && c.getContainer().getId() == evt.getContainerID(); + && c.getContainerId() == evt.getContainerID(); } }; // total 2 resource localzation calls. one for each resource. @@ -760,11 +760,11 @@ public class TestResourceLocalizationSer // Container - 1 ContainerImpl container1 = createMockContainer(user, 1); - String localizerId1 = container1.getContainer().getId().toString(); + String localizerId1 = container1.getContainerId().toString(); rls.getPrivateLocalizers().put( localizerId1, rls.new LocalizerRunner(new LocalizerContext(user, container1 - .getContainer().getId(), null), localizerId1)); + .getContainerId(), null), localizerId1)); LocalizerRunner localizerRunner1 = rls.getLocalizerRunner(localizerId1); dispatcher1.getEventHandler().handle( @@ -775,11 +775,11 @@ public class TestResourceLocalizationSer // Container - 2 now makes the request. ContainerImpl container2 = createMockContainer(user, 2); - String localizerId2 = container2.getContainer().getId().toString(); + String localizerId2 = container2.getContainerId().toString(); rls.getPrivateLocalizers().put( localizerId2, rls.new LocalizerRunner(new LocalizerContext(user, container2 - .getContainer().getId(), null), localizerId2)); + .getContainerId(), null), localizerId2)); LocalizerRunner localizerRunner2 = rls.getLocalizerRunner(localizerId2); dispatcher1.getEventHandler().handle( createContainerLocalizationEvent(container2, @@ -920,11 +920,11 @@ public class TestResourceLocalizationSer // Container - 1 Container container1 = createMockContainer(user, 1); - String localizerId1 = container1.getContainer().getId().toString(); + String localizerId1 = container1.getContainerId().toString(); rls.getPrivateLocalizers().put( localizerId1, rls.new LocalizerRunner(new LocalizerContext(user, container1 - .getContainer().getId(), null), localizerId1)); + .getContainerId(), null), localizerId1)); // Creating two requests for container // 1) Private resource @@ -1317,10 +1317,7 @@ public class TestResourceLocalizationSer private ContainerImpl createMockContainer(String user, int containerId) { ContainerImpl container = mock(ContainerImpl.class); - org.apache.hadoop.yarn.api.records.Container c = - mock(org.apache.hadoop.yarn.api.records.Container.class); - when(container.getContainer()).thenReturn(c); - when(container.getContainer().getId()).thenReturn( + when(container.getContainerId()).thenReturn( BuilderUtils.newContainerId(1, 1, 1, containerId)); when(container.getUser()).thenReturn(user); Credentials mockCredentials = mock(Credentials.class); @@ -1360,11 +1357,8 @@ public class TestResourceLocalizationSer ApplicationAttemptId appAttemptId = BuilderUtils.newApplicationAttemptId(appId, 1); ContainerId cId = BuilderUtils.newContainerId(appAttemptId, id); - org.apache.hadoop.yarn.api.records.Container containerAPI = - mock(org.apache.hadoop.yarn.api.records.Container.class); - when(c.getContainer()).thenReturn(containerAPI); when(c.getUser()).thenReturn("user0"); - when(c.getContainer().getId()).thenReturn(cId); + when(c.getContainerId()).thenReturn(cId); Credentials creds = new Credentials(); creds.addToken(new Text("tok" + id), getToken(id)); when(c.getCredentials()).thenReturn(creds); Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java Fri May 31 04:13:16 2013 @@ -55,10 +55,10 @@ import org.apache.hadoop.yarn.api.protoc import org.apache.hadoop.yarn.api.records.ApplicationAccessType; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerState; +import org.apache.hadoop.yarn.api.records.ContainerToken; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.LocalResourceType; import org.apache.hadoop.yarn.api.records.LocalResourceVisibility; @@ -707,15 +707,12 @@ public class TestLogAggregationService e ContainerLaunchContext containerLaunchContext = recordFactory.newRecordInstance(ContainerLaunchContext.class); - Container mockContainer = mock(Container.class); // ////// Construct the Container-id ApplicationId appId = ApplicationId.newInstance(0, 0); ApplicationAttemptId appAttemptId = BuilderUtils.newApplicationAttemptId(appId, 1); ContainerId cId = BuilderUtils.newContainerId(appAttemptId, 0); - when(mockContainer.getId()).thenReturn(cId); - URL resource_alpha = ConverterUtils.getYarnUrlFromPath(localFS .makeQualified(new Path(scriptFile.getAbsolutePath()))); @@ -736,15 +733,14 @@ public class TestLogAggregationService e commands.add(scriptFile.getAbsolutePath()); containerLaunchContext.setCommands(commands); Resource r = BuilderUtils.newResource(100 * 1024 * 1024, 1); - when(mockContainer.getResource()).thenReturn(r); - when(mockContainer.getContainerToken()).thenReturn( - BuilderUtils.newContainerToken(cId, "127.0.0.1", 1234, user, r, - System.currentTimeMillis() + 10000L, 123, "password".getBytes(), - super.DUMMY_RM_IDENTIFIER)); + ContainerToken containerToken = + BuilderUtils.newContainerToken(cId, "127.0.0.1", 1234, user, r, + System.currentTimeMillis() + 10000L, 123, "password".getBytes(), + super.DUMMY_RM_IDENTIFIER); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); this.containerManager.startContainer(startRequest); BaseContainerManagerTest.waitForContainerState(this.containerManager, Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainersMonitor.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainersMonitor.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainersMonitor.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainersMonitor.java Fri May 31 04:13:16 2013 @@ -22,7 +22,6 @@ import static org.junit.Assert.assertEqu import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import java.io.BufferedReader; import java.io.File; @@ -45,7 +44,6 @@ import org.apache.hadoop.yarn.api.protoc import org.apache.hadoop.yarn.api.protocolrecords.StartContainerRequest; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -202,7 +200,6 @@ public class TestContainersMonitor exten ContainerLaunchContext containerLaunchContext = recordFactory.newRecordInstance(ContainerLaunchContext.class); - Container mockContainer = mock(Container.class); // ////// Construct the Container-id ApplicationId appId = ApplicationId.newInstance(0, 0); ApplicationAttemptId appAttemptId = @@ -212,12 +209,7 @@ public class TestContainersMonitor exten ContainerId cId = recordFactory.newRecordInstance(ContainerId.class); cId.setId(0); cId.setApplicationAttemptId(appAttemptId); - when(mockContainer.getId()).thenReturn(cId); - - when(mockContainer.getNodeId()).thenReturn(context.getNodeId()); int port = 12345; - when(mockContainer.getNodeHttpAddress()).thenReturn( - context.getNodeId().getHost() + ":" + port); URL resource_alpha = ConverterUtils.getYarnUrlFromPath(localFS @@ -239,7 +231,6 @@ public class TestContainersMonitor exten commands.add(scriptFile.getAbsolutePath()); containerLaunchContext.setCommands(commands); Resource r = BuilderUtils.newResource(8 * 1024 * 1024, 1); - when(mockContainer.getResource()).thenReturn(r); StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(containerLaunchContext); @@ -247,8 +238,7 @@ public class TestContainersMonitor exten BuilderUtils.newContainerToken(cId, context.getNodeId().getHost(), port, user, r, System.currentTimeMillis() + 10000L, 123, "password".getBytes(), super.DUMMY_RM_IDENTIFIER); - when(mockContainer.getContainerToken()).thenReturn(containerToken); - startRequest.setContainer(mockContainer); + startRequest.setContainerToken(containerToken); containerManager.startContainer(startRequest); int timeoutSecs = 0; Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/MockContainer.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/MockContainer.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/MockContainer.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/MockContainer.java Fri May 31 04:13:16 2013 @@ -18,9 +18,6 @@ package org.apache.hadoop.yarn.server.nodemanager.webapp; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -34,10 +31,11 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerStatus; -import org.apache.hadoop.yarn.api.records.ContainerToken; +import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; +import org.apache.hadoop.yarn.security.ContainerTokenIdentifier; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerEvent; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerState; @@ -52,7 +50,7 @@ public class MockContainer implements Co private final Map> resource = new HashMap>(); private RecordFactory recordFactory; - private org.apache.hadoop.yarn.api.records.Container mockContainer; + private final ContainerTokenIdentifier containerTokenIdentifier; public MockContainer(ApplicationAttemptId appAttemptId, Dispatcher dispatcher, Configuration conf, String user, @@ -65,15 +63,12 @@ public class MockContainer implements Co this.launchContext = recordFactory .newRecordInstance(ContainerLaunchContext.class); long currentTime = System.currentTimeMillis(); - ContainerToken containerToken = - BuilderUtils.newContainerToken(id, "127.0.0.1", 1234, user, - BuilderUtils.newResource(1024, 1), currentTime + 10000, 123, - "password".getBytes(), currentTime); + this.containerTokenIdentifier = + BuilderUtils.newContainerTokenIdentifier(BuilderUtils + .newContainerToken(id, "127.0.0.1", 1234, user, + BuilderUtils.newResource(1024, 1), currentTime + 10000, 123, + "password".getBytes(), currentTime)); this.state = ContainerState.NEW; - - mockContainer = mock(org.apache.hadoop.yarn.api.records.Container.class); - when(mockContainer.getContainerToken()).thenReturn(containerToken); - when(mockContainer.getId()).thenReturn(id); } public void setState(ContainerState state) { @@ -126,7 +121,17 @@ public class MockContainer implements Co } @Override - public org.apache.hadoop.yarn.api.records.Container getContainer() { - return this.mockContainer; + public ContainerId getContainerId() { + return this.id; + } + + @Override + public Resource getResource() { + return this.containerTokenIdentifier.getResource(); + } + + @Override + public ContainerTokenIdentifier getContainerTokenIdentifier() { + return this.containerTokenIdentifier; } } Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java Fri May 31 04:13:16 2013 @@ -26,7 +26,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; -import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; @@ -76,7 +75,7 @@ public class TestNMWebServer { FileUtil.fullyDelete(testLogDir); } - private String startNMWebAppServer(String webAddr) { + private int startNMWebAppServer(String webAddr) { Context nmContext = new NodeManager.NMContext(null); ResourceView resourceView = new ResourceView() { @Override @@ -107,20 +106,19 @@ public class TestNMWebServer { new ApplicationACLsManager(conf), dirsHandler); server.init(conf); server.start(); - String webAppAddr = conf.get(YarnConfiguration.NM_WEBAPP_ADDRESS); - return StringUtils.split(webAppAddr, ':')[1]; + return server.getPort(); } @Test public void testNMWebAppWithOutPort() throws IOException { - String port = startNMWebAppServer("0.0.0.0"); - Assert.assertTrue("Port is not updated", Integer.parseInt(port) > 0); + int port = startNMWebAppServer("0.0.0.0"); + Assert.assertTrue("Port is not updated", port > 0); } @Test public void testNMWebAppWithEphemeralPort() throws IOException { - String port = startNMWebAppServer("0.0.0.0:0"); - Assert.assertTrue("Port is not updated", Integer.parseInt(port) > 0); + int port = startNMWebAppServer("0.0.0.0:0"); + Assert.assertTrue("Port is not updated", port > 0); } @Test @@ -180,17 +178,13 @@ public class TestNMWebServer { // TODO: Use builder utils ContainerLaunchContext launchContext = recordFactory.newRecordInstance(ContainerLaunchContext.class); - org.apache.hadoop.yarn.api.records.Container mockContainer = - mock(org.apache.hadoop.yarn.api.records.Container.class); long currentTime = System.currentTimeMillis(); ContainerToken containerToken = BuilderUtils.newContainerToken(containerId, "127.0.0.1", 1234, user, BuilderUtils.newResource(1024, 1), currentTime + 10000L, 123, "password".getBytes(), currentTime); - when(mockContainer.getContainerToken()).thenReturn(containerToken); - when(mockContainer.getId()).thenReturn(containerId); Container container = - new ContainerImpl(conf, dispatcher, launchContext, mockContainer, + new ContainerImpl(conf, dispatcher, launchContext, null, metrics, BuilderUtils.newContainerTokenIdentifier(containerToken)) { Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesApps.java Fri May 31 04:13:16 2013 @@ -188,17 +188,17 @@ public class TestNMWebServicesApps exten Container container2 = new MockContainer(appAttemptId, dispatcher, conf, app.getUser(), app.getAppId(), 2); nmContext.getContainers() - .put(container1.getContainer().getId(), container1); + .put(container1.getContainerId(), container1); nmContext.getContainers() - .put(container2.getContainer().getId(), container2); + .put(container2.getContainerId(), container2); - app.getContainers().put(container1.getContainer().getId(), container1); - app.getContainers().put(container2.getContainer().getId(), container2); + app.getContainers().put(container1.getContainerId(), container1); + app.getContainers().put(container2.getContainerId(), container2); HashMap hash = new HashMap(); - hash.put(container1.getContainer().getId().toString(), container1 - .getContainer().getId().toString()); - hash.put(container2.getContainer().getId().toString(), container2 - .getContainer().getId().toString()); + hash.put(container1.getContainerId().toString(), container1 + .getContainerId().toString()); + hash.put(container2.getContainerId().toString(), container2 + .getContainerId().toString()); return hash; } Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServicesContainers.java Fri May 31 04:13:16 2013 @@ -35,6 +35,7 @@ import javax.xml.parsers.DocumentBuilder import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; +import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.AsyncDispatcher; import org.apache.hadoop.yarn.event.Dispatcher; @@ -92,9 +93,15 @@ public class TestNMWebServicesContainers private Injector injector = Guice.createInjector(new ServletModule() { @Override protected void configureServlets() { - nmContext = new NodeManager.NMContext(null); - nmContext.getNodeId().setHost("testhost.foo.com"); - nmContext.getNodeId().setPort(8042); + nmContext = new NodeManager.NMContext(null) { + public NodeId getNodeId() { + return NodeId.newInstance("testhost.foo.com", 8042); + }; + + public int getHttpPort() { + return 1234; + }; + }; resourceView = new ResourceView() { @Override public long getVmemAllocatedForContainers() { @@ -189,17 +196,17 @@ public class TestNMWebServicesContainers Container container2 = new MockContainer(appAttemptId, dispatcher, conf, app.getUser(), app.getAppId(), 2); nmContext.getContainers() - .put(container1.getContainer().getId(), container1); + .put(container1.getContainerId(), container1); nmContext.getContainers() - .put(container2.getContainer().getId(), container2); + .put(container2.getContainerId(), container2); - app.getContainers().put(container1.getContainer().getId(), container1); - app.getContainers().put(container2.getContainer().getId(), container2); + app.getContainers().put(container1.getContainerId(), container1); + app.getContainers().put(container2.getContainerId(), container2); HashMap hash = new HashMap(); - hash.put(container1.getContainer().getId().toString(), container1 - .getContainer().getId().toString()); - hash.put(container2.getContainer().getId().toString(), container2 - .getContainer().getId().toString()); + hash.put(container1.getContainerId().toString(), container1 + .getContainerId().toString()); + hash.put(container2.getContainerId().toString(), container2 + .getContainerId().toString()); return hash; } @@ -472,7 +479,7 @@ public class TestNMWebServicesContainers String state, String user, int exitCode, String diagnostics, String nodeId, int totalMemoryNeededMB, String logsLink) throws JSONException, Exception { - WebServicesTestUtils.checkStringMatch("id", cont.getContainer().getId() + WebServicesTestUtils.checkStringMatch("id", cont.getContainerId() .toString(), id); WebServicesTestUtils.checkStringMatch("state", cont.getContainerState() .toString(), state); @@ -484,9 +491,11 @@ public class TestNMWebServicesContainers WebServicesTestUtils.checkStringMatch("nodeId", nmContext.getNodeId() .toString(), nodeId); - assertEquals("totalMemoryNeededMB wrong", 0, totalMemoryNeededMB); + assertEquals("totalMemoryNeededMB wrong", + YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB, + totalMemoryNeededMB); String shortLink = - ujoin("containerlogs", cont.getContainer().getId().toString(), + ujoin("containerlogs", cont.getContainerId().toString(), cont.getUser()); assertTrue("containerLogsLink wrong", logsLink.contains(shortLink)); } Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java Fri May 31 04:13:16 2013 @@ -109,7 +109,7 @@ public class AMLauncher implements Runna StartContainerRequest request = recordFactory.newRecordInstance(StartContainerRequest.class); request.setContainerLaunchContext(launchContext); - request.setContainer(masterContainer); + request.setContainerToken(masterContainer.getContainerToken()); containerMgrProxy.startContainer(request); LOG.info("Done launching container " + masterContainer + " for AM " + application.getAppAttemptId()); Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java Fri May 31 04:13:16 2013 @@ -342,7 +342,7 @@ public class Application { // Launch the container StartContainerRequest startRequest = recordFactory.newRecordInstance(StartContainerRequest.class); startRequest.setContainerLaunchContext(createCLC()); - startRequest.setContainer(container); + startRequest.setContainerToken(container.getContainerToken()); nodeManager.startContainer(startRequest); break; } Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/NodeManager.java Fri May 31 04:13:16 2013 @@ -42,6 +42,7 @@ import org.apache.hadoop.yarn.api.record import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerState; import org.apache.hadoop.yarn.api.records.ContainerStatus; +import org.apache.hadoop.yarn.api.records.ContainerToken; import org.apache.hadoop.yarn.api.records.NodeHealthStatus; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Resource; @@ -49,6 +50,7 @@ import org.apache.hadoop.yarn.exceptions import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.RPCUtil; +import org.apache.hadoop.yarn.security.ContainerTokenIdentifier; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatRequest; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerRequest; @@ -161,11 +163,19 @@ public class NodeManager implements Cont synchronized public StartContainerResponse startContainer( StartContainerRequest request) throws YarnRemoteException { - Container requestContainer = request.getContainer(); - ApplicationId applicationId = - requestContainer.getId().getApplicationAttemptId(). - getApplicationId(); + ContainerToken containerToken = request.getContainerToken(); + ContainerTokenIdentifier tokenId = null; + + try { + tokenId = BuilderUtils.newContainerTokenIdentifier(containerToken); + } catch (IOException e) { + throw RPCUtil.getRemoteException(e); + } + + ContainerId containerID = tokenId.getContainerID(); + ApplicationId applicationId = + containerID.getApplicationAttemptId().getApplicationId(); List applicationContainers = containers.get(applicationId); if (applicationContainers == null) { @@ -175,18 +185,18 @@ public class NodeManager implements Cont // Sanity check for (Container container : applicationContainers) { - if (container.getId().compareTo(requestContainer.getId()) + if (container.getId().compareTo(containerID) == 0) { throw new IllegalStateException( - "Container " + requestContainer.getId() + + "Container " + containerID + " already setup on node " + containerManagerAddress); } } Container container = - BuilderUtils.newContainer(requestContainer.getId(), + BuilderUtils.newContainer(containerID, this.nodeId, nodeHttpAddress, - requestContainer.getResource(), + tokenId.getResource(), null, null // DKDC - Doesn't matter ); @@ -195,8 +205,8 @@ public class NodeManager implements Cont "", -1000); applicationContainers.add(container); containerStatusMap.put(container, containerStatus); - Resources.subtractFrom(available, requestContainer.getResource()); - Resources.addTo(used, requestContainer.getResource()); + Resources.subtractFrom(available, tokenId.getResource()); + Resources.addTo(used, tokenId.getResource()); if(LOG.isDebugEnabled()) { LOG.debug("startContainer:" + " node=" + containerManagerAddress Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java?rev=1488085&r1=1488084&r2=1488085&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java Fri May 31 04:13:16 2013 @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager; +import java.io.IOException; import java.util.Map; import org.apache.commons.logging.Log; @@ -33,11 +34,15 @@ import org.apache.hadoop.yarn.api.protoc import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerState; +import org.apache.hadoop.yarn.api.records.ContainerToken; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRemoteException; +import org.apache.hadoop.yarn.ipc.RPCUtil; +import org.apache.hadoop.yarn.security.ContainerTokenIdentifier; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState; +import org.apache.hadoop.yarn.util.BuilderUtils; import org.apache.log4j.Level; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; @@ -57,8 +62,6 @@ public class TestApplicationMasterLaunch String attemptIdAtContainerManager = null; String containerIdAtContainerManager = null; String nmHostAtContainerManager = null; - int nmPortAtContainerManager; - int nmHttpPortAtContainerManager; long submitTimeAtContainerManager; int maxAppAttempts; @@ -70,17 +73,21 @@ public class TestApplicationMasterLaunch launched = true; Map env = request.getContainerLaunchContext().getEnvironment(); - ContainerId containerId = - request.getContainer().getId(); + + ContainerToken containerToken = request.getContainerToken(); + ContainerTokenIdentifier tokenId = null; + + try { + tokenId = BuilderUtils.newContainerTokenIdentifier(containerToken); + } catch (IOException e) { + throw RPCUtil.getRemoteException(e); + } + + ContainerId containerId = tokenId.getContainerID(); containerIdAtContainerManager = containerId.toString(); attemptIdAtContainerManager = containerId.getApplicationAttemptId().toString(); - nmHostAtContainerManager = request.getContainer().getNodeId().getHost(); - nmPortAtContainerManager = - request.getContainer().getNodeId().getPort(); - nmHttpPortAtContainerManager = - Integer.parseInt(request.getContainer().getNodeHttpAddress() - .split(":")[1]); + nmHostAtContainerManager = tokenId.getNmHostAddress(); submitTimeAtContainerManager = Long.parseLong(env.get(ApplicationConstants.APP_SUBMIT_TIME_ENV)); maxAppAttempts = @@ -135,12 +142,8 @@ public class TestApplicationMasterLaunch Assert.assertEquals(app.getRMAppAttempt(appAttemptId) .getMasterContainer().getId() .toString(), containerManager.containerIdAtContainerManager); - Assert.assertEquals(nm1.getNodeId().getHost(), - containerManager.nmHostAtContainerManager); - Assert.assertEquals(nm1.getNodeId().getPort(), - containerManager.nmPortAtContainerManager); - Assert.assertEquals(nm1.getHttpPort(), - containerManager.nmHttpPortAtContainerManager); + Assert.assertEquals(nm1.getNodeId().toString(), + containerManager.nmHostAtContainerManager); Assert.assertEquals(YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS, containerManager.maxAppAttempts);