Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-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 8B3347F88 for ; Wed, 3 Aug 2011 11:46:26 +0000 (UTC) Received: (qmail 93811 invoked by uid 500); 3 Aug 2011 11:46:26 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 93730 invoked by uid 500); 3 Aug 2011 11:46:23 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 93711 invoked by uid 99); 3 Aug 2011 11:46:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2011 11:46:22 +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; Wed, 03 Aug 2011 11:46:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8B2B323888BD; Wed, 3 Aug 2011 11:46:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153444 - in /hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server: yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ yarn-server-resourcemanager/src/test/java/org/apache/hadoo... Date: Wed, 03 Aug 2011 11:46:00 -0000 To: mapreduce-commits@hadoop.apache.org From: vinodkv@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110803114600.8B2B323888BD@eris.apache.org> Author: vinodkv Date: Wed Aug 3 11:45:56 2011 New Revision: 1153444 URL: http://svn.apache.org/viewvc?rev=1153444&view=rev Log: Fixing TestNMExpiry Added: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/InlineDispatcher.java Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCResponseId.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCResponseId.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCResponseId.java?rev=1153444&r1=1153443&r2=1153444&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCResponseId.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRMRPCResponseId.java Wed Aug 3 11:45:56 2011 @@ -20,16 +20,8 @@ package org.apache.hadoop.yarn.server.re import junit.framework.Assert; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest; -import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest; -import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRequest; -import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest; import org.apache.hadoop.yarn.api.records.AMResponse; -import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.ApplicationState; -import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; -import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.server.resourcemanager.ApplicationMasterService; @@ -38,15 +30,11 @@ import org.apache.hadoop.yarn.server.res import org.apache.hadoop.yarn.server.resourcemanager.MockNM; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; -import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; 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.Records; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mortbay.log.Log; public class TestAMRMRPCResponseId { Added: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/InlineDispatcher.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/InlineDispatcher.java?rev=1153444&view=auto ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/InlineDispatcher.java (added) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/InlineDispatcher.java Wed Aug 3 11:45:56 2011 @@ -0,0 +1,32 @@ +package org.apache.hadoop.yarn.server.resourcemanager.resourcetracker; + +import org.apache.hadoop.yarn.event.AsyncDispatcher; +import org.apache.hadoop.yarn.event.Event; +import org.apache.hadoop.yarn.event.EventHandler; + +class InlineDispatcher extends AsyncDispatcher { + private class InlineEventHandler implements EventHandler { + private final InlineDispatcher dispatcher; + public InlineEventHandler(InlineDispatcher dispatcher) { + this.dispatcher = dispatcher; + } + @Override + public void handle(Event event) { + this.dispatcher.dispatch(event); + } + } + public void dispatch(Event event) { + super.dispatch(event); + } + @Override + public EventHandler getEventHandler() { + return new InlineEventHandler(this); + } + + static class EmptyEventHandler implements EventHandler { + @Override + public void handle(Event event) { + ; // ignore + } + } +} \ No newline at end of file Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java?rev=1153444&r1=1153443&r2=1153444&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java Wed Aug 3 11:45:56 2011 @@ -18,175 +18,177 @@ package org.apache.hadoop.yarn.server.resourcemanager.resourcetracker; -import java.util.List; -import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import junit.framework.Assert; -import junit.framework.TestCase; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.NodeHealthStatus; import org.apache.hadoop.yarn.api.records.NodeId; 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.server.api.protocolrecords.NodeHeartbeatRequest; import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerRequest; import org.apache.hadoop.yarn.server.api.records.RegistrationResponse; import org.apache.hadoop.yarn.server.resourcemanager.NMLivelinessMonitor; +import org.apache.hadoop.yarn.server.resourcemanager.NodesListManager; import org.apache.hadoop.yarn.server.resourcemanager.RMConfig; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.RMContextImpl; import org.apache.hadoop.yarn.server.resourcemanager.ResourceTrackerService; import org.apache.hadoop.yarn.server.resourcemanager.recovery.MemStore; -import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; +import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEventType; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType; import org.apache.hadoop.yarn.server.security.ContainerTokenSecretManager; +import org.apache.hadoop.yarn.util.Records; import org.junit.Before; import org.junit.Test; public class TestNMExpiry { -// private static final Log LOG = LogFactory.getLog(TestNMExpiry.class); -// private static final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null); -// -// ResourceTrackerService resourceTrackerService; -// ContainerTokenSecretManager containerTokenSecretManager = -// new ContainerTokenSecretManager(); -// AtomicInteger test = new AtomicInteger(); -// AtomicInteger notify = new AtomicInteger(); -// -// private static class VoidResourceListener implements ResourceListener { -// -// @Override -// public void removeNode(RMNode node) { -// } -// @Override -// public void nodeUpdate(RMNode nodeInfo, -// Map> containers) { -// -// } -// @Override -// public void addNode(RMNode nodeInfo) { -// -// } -// } -// -// private class TestNmLivelinessMonitor extends NMLivelinessMonitor { -// public TestNmLivelinessMonitor(RMContext context) { -// super(context); -// } -// -// @Override -// protected void expireNodes(List ids) { -// for (NodeId id: ids) { -// LOG.info("Expired " + id); -// if (test.addAndGet(1) == 2) { -// try { -// /* delay atleast 2 seconds to make sure the 3rd one does not expire -// * -// */ -// Thread.sleep(2000); -// } catch(InterruptedException ie){} -// synchronized(notify) { -// notify.addAndGet(1); -// notify.notifyAll(); -// } -// } -// } -// } -// } -// -// @Before -// public void setUp() { -// Configuration conf = new Configuration(); -// RMContext context = new RMContextImpl(new MemStore()); -// NMLivelinessMonitor nmLivelinessMonitror = new TestNmLivelinessMonitor( -// context); -// nmLivelinessMonitror.start(); -// resourceTrackerService = new ResourceTrackerService(context, -// nmLivelinessMonitror, containerTokenSecretManager); -// context.getNodesCollection().addListener(new VoidResourceListener()); -// -// conf.setLong(RMConfig.NM_EXPIRY_INTERVAL, 1000); -// resourceTrackerService.init(conf); -// resourceTrackerService.start(); -// } -// -// private class ThirdNodeHeartBeatThread extends Thread { -// public void run() { -// int lastResponseID = 0; -// while (!stopT) { -// try { -// org.apache.hadoop.yarn.server.api.records.NodeStatus nodeStatus = -// recordFactory -// .newRecordInstance(org.apache.hadoop.yarn.server.api.records.NodeStatus.class); -// nodeStatus.setNodeId(thirdNodeRegResponse.getNodeId()); -// nodeStatus.setResponseId(lastResponseID); -// nodeStatus.setNodeHealthStatus(recordFactory.newRecordInstance(NodeHealthStatus.class)); -// nodeStatus.getNodeHealthStatus().setIsNodeHealthy(true); -// -// NodeHeartbeatRequest request = recordFactory -// .newRecordInstance(NodeHeartbeatRequest.class); -// request.setNodeStatus(nodeStatus); -// lastResponseID = resourceTrackerService.nodeHeartbeat(request) -// .getHeartbeatResponse().getResponseId(); -// -// } catch(Exception e) { -// LOG.info("failed to heartbeat ", e); -// } -// } -// } -// } -// -// boolean stopT = false; -// RegistrationResponse thirdNodeRegResponse; -// -// @Test -// public void testNMExpiry() throws Exception { -// String hostname1 = "localhost1"; -// String hostname2 = "localhost2"; -// String hostname3 = "localhost3"; -// Resource capability = recordFactory.newRecordInstance(Resource.class); -// -// RegisterNodeManagerRequest request1 = recordFactory -// .newRecordInstance(RegisterNodeManagerRequest.class); -// request1.setContainerManagerPort(0); -// request1.setHost(hostname1); -// request1.setHttpPort(0); -// request1.setResource(capability); -// resourceTrackerService.registerNodeManager(request1); -// -// RegisterNodeManagerRequest request2 = recordFactory -// .newRecordInstance(RegisterNodeManagerRequest.class); -// request2.setContainerManagerPort(0); -// request2.setHost(hostname2); -// request2.setHttpPort(0); -// request2.setResource(capability); -// resourceTrackerService.registerNodeManager(request2); -// -// RegisterNodeManagerRequest request3 = recordFactory -// .newRecordInstance(RegisterNodeManagerRequest.class); -// request3.setContainerManagerPort(0); -// request3.setHost(hostname3); -// request3.setHttpPort(0); -// request3.setResource(capability); -// thirdNodeRegResponse = resourceTrackerService.registerNodeManager( -// request3).getRegistrationResponse(); -// -// /* test to see if hostanme 3 does not expire */ -// stopT = false; -// new ThirdNodeHeartBeatThread().start(); -// int timeOut = 0; -// synchronized (notify) { -// while (notify.get() == 0 && timeOut++ < 30) { -// notify.wait(1000); -// } -// } -// Assert.assertEquals(2, test.get()); -// -// stopT = true; -// } + private static final Log LOG = LogFactory.getLog(TestNMExpiry.class); + private static final RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null); + + ResourceTrackerService resourceTrackerService; + ContainerTokenSecretManager containerTokenSecretManager = + new ContainerTokenSecretManager(); + AtomicInteger test = new AtomicInteger(); + AtomicInteger notify = new AtomicInteger(); + + private class TestNmLivelinessMonitor extends NMLivelinessMonitor { + public TestNmLivelinessMonitor(Dispatcher dispatcher) { + super(dispatcher); + } + + @Override + public void init(Configuration conf) { + conf.setLong(RMConfig.NM_EXPIRY_INTERVAL, 1000); + super.init(conf); + } + @Override + protected void expire(NodeId id) { + LOG.info("Expired " + id); + if (test.addAndGet(1) == 2) { + try { + /* delay atleast 2 seconds to make sure the 3rd one does not expire + * + */ + Thread.sleep(2000); + } catch(InterruptedException ie){} + synchronized(notify) { + notify.addAndGet(1); + notify.notifyAll(); + } + } + } + } + + @Before + public void setUp() { + Configuration conf = new Configuration(); + // Dispatcher that processes events inline + Dispatcher dispatcher = new InlineDispatcher(); + dispatcher.register(SchedulerEventType.class, + new InlineDispatcher.EmptyEventHandler()); + dispatcher.register(RMNodeEventType.class, + new InlineDispatcher.EmptyEventHandler()); + RMContext context = new RMContextImpl(new MemStore(), dispatcher, null, + null); + NMLivelinessMonitor nmLivelinessMonitor = new TestNmLivelinessMonitor( + dispatcher); + nmLivelinessMonitor.init(conf); + nmLivelinessMonitor.start(); + NodesListManager nodesListManager = new NodesListManager(); + nodesListManager.init(conf); + resourceTrackerService = new ResourceTrackerService(context, + nodesListManager, nmLivelinessMonitor, containerTokenSecretManager); + + resourceTrackerService.init(conf); + resourceTrackerService.start(); + } + + private class ThirdNodeHeartBeatThread extends Thread { + public void run() { + int lastResponseID = 0; + while (!stopT) { + try { + org.apache.hadoop.yarn.server.api.records.NodeStatus nodeStatus = + recordFactory + .newRecordInstance(org.apache.hadoop.yarn.server.api.records.NodeStatus.class); + nodeStatus.setNodeId(request3.getNodeId()); + nodeStatus.setResponseId(lastResponseID); + nodeStatus.setNodeHealthStatus(recordFactory.newRecordInstance(NodeHealthStatus.class)); + nodeStatus.getNodeHealthStatus().setIsNodeHealthy(true); + + NodeHeartbeatRequest request = recordFactory + .newRecordInstance(NodeHeartbeatRequest.class); + request.setNodeStatus(nodeStatus); + lastResponseID = resourceTrackerService.nodeHeartbeat(request) + .getHeartbeatResponse().getResponseId(); + + Thread.sleep(1000); + } catch(Exception e) { + LOG.info("failed to heartbeat ", e); + } + } + } + } + + boolean stopT = false; + RegisterNodeManagerRequest request3; + + @Test + public void testNMExpiry() throws Exception { + String hostname1 = "localhost1"; + String hostname2 = "localhost2"; + String hostname3 = "localhost3"; + Resource capability = recordFactory.newRecordInstance(Resource.class); + + RegisterNodeManagerRequest request1 = recordFactory + .newRecordInstance(RegisterNodeManagerRequest.class); + NodeId nodeId1 = Records.newRecord(NodeId.class); + nodeId1.setPort(0); + nodeId1.setHost(hostname1); + request1.setNodeId(nodeId1); + request1.setHttpPort(0); + request1.setResource(capability); + resourceTrackerService.registerNodeManager(request1); + + RegisterNodeManagerRequest request2 = recordFactory + .newRecordInstance(RegisterNodeManagerRequest.class); + NodeId nodeId2 = Records.newRecord(NodeId.class); + nodeId2.setPort(0); + nodeId2.setHost(hostname2); + request2.setNodeId(nodeId2); + request2.setHttpPort(0); + request2.setResource(capability); + resourceTrackerService.registerNodeManager(request2); + + request3 = recordFactory + .newRecordInstance(RegisterNodeManagerRequest.class); + NodeId nodeId3 = Records.newRecord(NodeId.class); + nodeId3.setPort(0); + nodeId3.setHost(hostname3); + request3.setNodeId(nodeId3); + request3.setHttpPort(0); + request3.setResource(capability); + RegistrationResponse thirdNodeRegResponse = resourceTrackerService + .registerNodeManager(request3).getRegistrationResponse(); + + /* test to see if hostanme 3 does not expire */ + stopT = false; + new ThirdNodeHeartBeatThread().start(); + int timeOut = 0; + synchronized (notify) { + while (notify.get() == 0 && timeOut++ < 30) { + notify.wait(1000); + } + } + Assert.assertEquals(2, test.get()); + + stopT = true; + } } Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java?rev=1153444&r1=1153443&r2=1153444&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestRMNMRPCResponseId.java Wed Aug 3 11:45:56 2011 @@ -24,7 +24,6 @@ import org.apache.hadoop.conf.Configurat import org.apache.hadoop.yarn.api.records.NodeHealthStatus; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.Resource; -import org.apache.hadoop.yarn.event.AsyncDispatcher; import org.apache.hadoop.yarn.event.Dispatcher; import org.apache.hadoop.yarn.event.Event; import org.apache.hadoop.yarn.event.EventHandler; @@ -56,26 +55,6 @@ public class TestRMNMRPCResponseId { new ContainerTokenSecretManager(); private NodeId nodeId; - private class InlineDispatcher extends AsyncDispatcher { - private class InlineEventHandler implements EventHandler { - private final InlineDispatcher dispatcher; - public InlineEventHandler(InlineDispatcher dispatcher) { - this.dispatcher = dispatcher; - } - @Override - public void handle(Event event) { - this.dispatcher.dispatch(event); - } - } - public void dispatch(Event event) { - super.dispatch(event); - } - @Override - public EventHandler getEventHandler() { - return new InlineEventHandler(this); - } - } - @Before public void setUp() { // Dispatcher that processes events inline Modified: hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java?rev=1153444&r1=1153443&r2=1153444&view=diff ============================================================================== --- hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java (original) +++ hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerTokenSecretManager.java Wed Aug 3 11:45:56 2011 @@ -49,14 +49,11 @@ import org.apache.hadoop.security.token. import org.apache.hadoop.yarn.api.AMRMProtocol; import org.apache.hadoop.yarn.api.ContainerManager; import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest; -import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest; import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusRequest; import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRequest; import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationMaster; -import org.apache.hadoop.yarn.api.records.ApplicationReport; -import org.apache.hadoop.yarn.api.records.ApplicationState; import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; @@ -83,7 +80,6 @@ import org.apache.hadoop.yarn.server.res 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.ConverterUtils; -import org.apache.hadoop.yarn.util.Records; import org.junit.BeforeClass; import org.junit.Test;