Repository: hadoop Updated Branches: refs/heads/branch-2.7 0edc76418 -> b406dcaff
YARN-2046. Out of band heartbeats are sent only on container kill and possibly too early. Contributed by Ming Ma Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b406dcaf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b406dcaf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b406dcaf Branch: refs/heads/branch-2.7 Commit: b406dcaff273b6c5649b659d2cc599bdff2268ef Parents: 0edc764 Author: Jason Lowe <jl...@apache.org> Authored: Tue Feb 23 20:53:30 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Tue Feb 23 20:53:30 2016 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 6 +++++ .../hadoop/yarn/server/nodemanager/Context.java | 2 ++ .../yarn/server/nodemanager/NodeManager.java | 12 ++++++++- .../containermanager/ContainerManagerImpl.java | 12 +++------ .../container/ContainerImpl.java | 22 ++++++++------- .../yarn/server/nodemanager/TestEventFlow.java | 1 + .../nodemanager/TestNodeStatusUpdater.java | 28 +++++++++++++------- .../BaseContainerManagerTest.java | 1 + .../containermanager/TestAuxServices.java | 7 +++-- .../container/TestContainer.java | 16 ++++++++--- .../nodemanager/webapp/TestNMWebServer.java | 5 ++-- 11 files changed, 77 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index eaf1cd0..f0de550 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -95,6 +95,9 @@ Release 2.7.3 - UNRELEASED YARN-4707. Remove the extra char (>) from SecureContainer.md. (Brahma Reddy Battula via aajisaka) + YARN-2046. Out of band heartbeats are sent only on container kill and + possibly too early (Ming Ma via jlowe) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES @@ -972,6 +975,9 @@ Release 2.6.5 - UNRELEASED BUG FIXES + YARN-2046. Out of band heartbeats are sent only on container kill and + possibly too early (Ming Ma via jlowe) + Release 2.6.4 - 2016-02-11 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java index 6e7e2ec..15b0090 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/Context.java @@ -77,4 +77,6 @@ public interface Context { boolean getDecommissioned(); void setDecommissioned(boolean isDecommissioned); + + NodeStatusUpdater getNodeStatusUpdater(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java index e7c4e39..3df0242 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java @@ -256,7 +256,8 @@ public class NodeManager extends CompositeService // StatusUpdater should be added last so that it get started last // so that we make sure everything is up before registering with RM. addService(nodeStatusUpdater); - + ((NMContext) context).setNodeStatusUpdater(nodeStatusUpdater); + super.serviceInit(conf); // TODO add local dirs to del } @@ -354,6 +355,7 @@ public class NodeManager extends CompositeService .getRecordFactory(null).newRecordInstance(NodeHealthStatus.class); private final NMStateStoreService stateStore; private boolean isDecommissioned = false; + private NodeStatusUpdater nodeStatusUpdater; public NMContext(NMContainerTokenSecretManager containerTokenSecretManager, NMTokenSecretManagerInNM nmTokenSecretManager, @@ -458,6 +460,14 @@ public class NodeManager extends CompositeService Map<ApplicationId, Credentials> systemCredentials) { this.systemCredentials = systemCredentials; } + + public NodeStatusUpdater getNodeStatusUpdater() { + return this.nodeStatusUpdater; + } + + public void setNodeStatusUpdater(NodeStatusUpdater nodeStatusUpdater) { + this.nodeStatusUpdater = nodeStatusUpdater; + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java index acac600..5465e54 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java @@ -316,9 +316,9 @@ public class ContainerManagerImpl extends CompositeService implements if (context.getApplications().containsKey(appId)) { Credentials credentials = parseCredentials(launchContext); Container container = new ContainerImpl(getConfig(), dispatcher, - context.getNMStateStore(), req.getContainerLaunchContext(), + req.getContainerLaunchContext(), credentials, metrics, token, rcs.getStatus(), rcs.getExitCode(), - rcs.getDiagnostics(), rcs.getKilled()); + rcs.getDiagnostics(), rcs.getKilled(), context); context.getContainers().put(containerId, container); dispatcher.getEventHandler().handle( new ApplicationContainerInitEvent(container)); @@ -833,8 +833,8 @@ public class ContainerManagerImpl extends CompositeService implements Container container = new ContainerImpl(getConfig(), this.dispatcher, - context.getNMStateStore(), launchContext, - credentials, metrics, containerTokenIdentifier); + launchContext, credentials, metrics, containerTokenIdentifier, + context); ApplicationId applicationID = containerId.getApplicationAttemptId().getApplicationId(); if (context.getContainers().putIfAbsent(containerId, container) != null) { @@ -982,10 +982,6 @@ public class ContainerManagerImpl extends CompositeService implements NMAuditLogger.logSuccess(container.getUser(), AuditConstants.STOP_CONTAINER, "ContainerManageImpl", containerID .getApplicationAttemptId().getApplicationId(), containerID); - - // TODO: Move this code to appropriate place once kill_container is - // implemented. - nodeStatusUpdater.sendOutofBandHeartBeat(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java index 7f1fdc3..eb65950 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java @@ -67,6 +67,7 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.shar import org.apache.hadoop.yarn.server.nodemanager.containermanager.loghandler.event.LogHandlerContainerFinishedEvent; import org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor.ContainerStartMonitoringEvent; import org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor.ContainerStopMonitoringEvent; +import org.apache.hadoop.yarn.server.nodemanager.Context; import org.apache.hadoop.yarn.server.nodemanager.metrics.NodeManagerMetrics; import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService; import org.apache.hadoop.yarn.server.nodemanager.recovery.NMStateStoreService.RecoveredContainerStatus; @@ -123,14 +124,15 @@ public class ContainerImpl implements Container { RecoveredContainerStatus.REQUESTED; // whether container was marked as killed after recovery private boolean recoveredAsKilled = false; + private Context context; public ContainerImpl(Configuration conf, Dispatcher dispatcher, - NMStateStoreService stateStore, ContainerLaunchContext launchContext, - Credentials creds, NodeManagerMetrics metrics, - ContainerTokenIdentifier containerTokenIdentifier) { + ContainerLaunchContext launchContext, Credentials creds, + NodeManagerMetrics metrics, + ContainerTokenIdentifier containerTokenIdentifier, Context context) { this.daemonConf = conf; this.dispatcher = dispatcher; - this.stateStore = stateStore; + this.stateStore = context.getNMStateStore(); this.launchContext = launchContext; this.containerTokenIdentifier = containerTokenIdentifier; this.containerId = containerTokenIdentifier.getContainerID(); @@ -142,19 +144,20 @@ public class ContainerImpl implements Container { ReadWriteLock readWriteLock = new ReentrantReadWriteLock(); this.readLock = readWriteLock.readLock(); this.writeLock = readWriteLock.writeLock(); + this.context = context; stateMachine = stateMachineFactory.make(this); } // constructor for a recovered container public ContainerImpl(Configuration conf, Dispatcher dispatcher, - NMStateStoreService stateStore, ContainerLaunchContext launchContext, - Credentials creds, NodeManagerMetrics metrics, + ContainerLaunchContext launchContext, Credentials creds, + NodeManagerMetrics metrics, ContainerTokenIdentifier containerTokenIdentifier, RecoveredContainerStatus recoveredStatus, int exitCode, - String diagnostics, boolean wasKilled) { - this(conf, dispatcher, stateStore, launchContext, creds, metrics, - containerTokenIdentifier); + String diagnostics, boolean wasKilled, Context context) { + this(conf, dispatcher, launchContext, creds, metrics, + containerTokenIdentifier, context); this.recoveredStatus = recoveredStatus; this.exitCode = exitCode; this.recoveredAsKilled = wasKilled; @@ -973,6 +976,7 @@ public class ContainerImpl implements Container { container.dispatcher.getEventHandler().handle(new AuxServicesEvent (AuxServicesEventType.CONTAINER_STOP, container)); } + container.context.getNodeStatusUpdater().sendOutofBandHeartBeat(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java index d2caefe..6962d59 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java @@ -131,6 +131,7 @@ public class TestEventFlow { nodeStatusUpdater.init(conf); ((NMContext)context).setContainerManager(containerManager); nodeStatusUpdater.start(); + ((NMContext)context).setNodeStatusUpdater(nodeStatusUpdater); containerManager.init(conf); containerManager.start(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java index f546bd4..52f4e75 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java @@ -242,8 +242,10 @@ public class TestNodeStatusUpdater { firstContainerID, InetAddress.getByName("localhost") .getCanonicalHostName(), 1234, user, resource, currentTime + 10000, 123, "password".getBytes(), currentTime)); + Context context = mock(Context.class); + when(context.getNMStateStore()).thenReturn(stateStore); Container container = new ContainerImpl(conf, mockDispatcher, - stateStore, launchContext, null, mockMetrics, containerToken); + launchContext, null, mockMetrics, containerToken, context); this.context.getContainers().put(firstContainerID, container); } else if (heartBeatID == 2) { // Checks on the RM end @@ -272,8 +274,10 @@ public class TestNodeStatusUpdater { secondContainerID, InetAddress.getByName("localhost") .getCanonicalHostName(), 1234, user, resource, currentTime + 10000, 123, "password".getBytes(), currentTime)); + Context context = mock(Context.class); + when(context.getNMStateStore()).thenReturn(stateStore); Container container = new ContainerImpl(conf, mockDispatcher, - stateStore, launchContext, null, mockMetrics, containerToken); + launchContext, null, mockMetrics, containerToken, context); this.context.getContainers().put(secondContainerID, container); } else if (heartBeatID == 3) { // Checks on the RM end @@ -889,8 +893,9 @@ public class TestNodeStatusUpdater { BuilderUtils.newResource(1024, 1), 0, 123, "password".getBytes(), 0); Container anyCompletedContainer = new ContainerImpl(conf, null, - null, null, null, null, - BuilderUtils.newContainerTokenIdentifier(containerToken)) { + null, null, null, + BuilderUtils.newContainerTokenIdentifier(containerToken), + nm.getNMContext()) { @Override public ContainerState getCurrentState() { @@ -910,8 +915,9 @@ public class TestNodeStatusUpdater { 1234, "anyUser", BuilderUtils.newResource(1024, 1), 0, 123, "password".getBytes(), 0); Container runningContainer = - new ContainerImpl(conf, null, null, null, null, null, - BuilderUtils.newContainerTokenIdentifier(runningContainerToken)) { + new ContainerImpl(conf, null, null, null, null, + BuilderUtils.newContainerTokenIdentifier(runningContainerToken), + nm.getNMContext()) { @Override public ContainerState getCurrentState() { return ContainerState.RUNNING; @@ -968,8 +974,9 @@ public class TestNodeStatusUpdater { BuilderUtils.newResource(1024, 1), 0, 123, "password".getBytes(), 0); Container completedContainer = new ContainerImpl(conf, null, - null, null, null, null, - BuilderUtils.newContainerTokenIdentifier(containerToken)) { + null, null, null, + BuilderUtils.newContainerTokenIdentifier(containerToken), + nm.getNMContext()) { @Override public ContainerState getCurrentState() { return ContainerState.COMPLETE; @@ -1005,8 +1012,9 @@ public class TestNodeStatusUpdater { BuilderUtils.newResource(1024, 1), 0, 123, "password".getBytes(), 0); Container anyCompletedContainer = new ContainerImpl(conf, null, - null, null, null, null, - BuilderUtils.newContainerTokenIdentifier(containerToken)) { + null, null, null, + BuilderUtils.newContainerTokenIdentifier(containerToken), + nm.getNMContext()) { @Override public ContainerState getCurrentState() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java index 1907e1a..c63b4a4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java @@ -182,6 +182,7 @@ public abstract class BaseContainerManagerTest { nodeStatusUpdater.init(conf); containerManager.init(conf); nodeStatusUpdater.start(); + ((NMContext)context).setNodeStatusUpdater(nodeStatusUpdater); } protected ContainerManagerImpl http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java index 757cdc8..7488278 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; import java.io.File; import java.io.IOException; @@ -53,6 +54,7 @@ import org.apache.hadoop.yarn.server.api.ApplicationTerminationContext; import org.apache.hadoop.yarn.server.api.AuxiliaryService; import org.apache.hadoop.yarn.server.api.ContainerInitializationContext; import org.apache.hadoop.yarn.server.api.ContainerTerminationContext; +import org.apache.hadoop.yarn.server.nodemanager.Context; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container; import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerImpl; import org.junit.Assert; @@ -191,8 +193,9 @@ public class TestAuxServices { ContainerTokenIdentifier cti = new ContainerTokenIdentifier( ContainerId.newContainerId(attemptId, 1), "", "", Resource.newInstance(1, 1), 0,0,0, Priority.newInstance(0), 0); - Container container = new ContainerImpl(null, null, null, null, null, - null, cti); + Context context = mock(Context.class); + Container container = new ContainerImpl(null, null, null, null, + null, cti, context); ContainerId containerId = container.getContainerId(); Resource resource = container.getResource(); event = new AuxServicesEvent(AuxServicesEventType.CONTAINER_INIT,container); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/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 ---------------------------------------------------------------------- diff --git a/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 b/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 index 2834e30..e8ff25f 100644 --- a/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 +++ b/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 @@ -88,6 +88,7 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.loghandler.eve import org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor.ContainersMonitorEvent; import org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor.ContainersMonitorEventType; import org.apache.hadoop.yarn.server.nodemanager.metrics.NodeManagerMetrics; +import org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdater; import org.apache.hadoop.yarn.server.nodemanager.recovery.NMNullStateStoreService; import org.apache.hadoop.yarn.server.utils.BuilderUtils; import org.junit.Assert; @@ -261,6 +262,7 @@ public class TestContainer { wc.containerSuccessful(); wc.containerResourcesCleanup(); assertEquals(ContainerState.DONE, wc.c.getContainerState()); + verifyOutofBandHeartBeat(wc); assertNull(wc.c.getLocalizedResources()); // Now in DONE, issue INIT wc.initContainer(); @@ -290,6 +292,7 @@ public class TestContainer { wc.containerSuccessful(); wc.containerResourcesCleanup(); assertEquals(ContainerState.DONE, wc.c.getContainerState()); + verifyOutofBandHeartBeat(wc); assertNull(wc.c.getLocalizedResources()); // Now in DONE, issue RESOURCE_FAILED as done by LocalizeRunner wc.resourceFailedContainer(); @@ -336,6 +339,7 @@ public class TestContainer { int killed = metrics.getKilledContainers(); wc.killContainer(); assertEquals(ContainerState.DONE, wc.c.getContainerState()); + verifyOutofBandHeartBeat(wc); assertEquals(ContainerExitStatus.KILLED_BY_RESOURCEMANAGER, wc.c.cloneAndGetContainerStatus().getExitStatus()); assertTrue(wc.c.cloneAndGetContainerStatus().getDiagnostics() @@ -596,6 +600,10 @@ public class TestContainer { verify(wc.localizerBus).handle(argThat(matchesReq)); } + private void verifyOutofBandHeartBeat(WrappedContainer wc) { + verify(wc.context.getNodeStatusUpdater()).sendOutofBandHeartBeat(); + } + private static class ResourcesReleasedMatcher extends ArgumentMatcher<LocalizationEvent> { final HashSet<LocalResourceRequest> resources = @@ -722,6 +730,7 @@ public class TestContainer { final Container c; final Map<String, LocalResource> localResources; final Map<String, ByteBuffer> serviceData; + final Context context = mock(Context.class); WrappedContainer(int appId, long timestamp, int id, String user) throws IOException { @@ -747,11 +756,12 @@ public class TestContainer { dispatcher.register(ApplicationEventType.class, appBus); dispatcher.register(LogHandlerEventType.class, LogBus); - Context context = mock(Context.class); when(context.getApplications()).thenReturn( new ConcurrentHashMap<ApplicationId, Application>()); NMNullStateStoreService stateStore = new NMNullStateStoreService(); when(context.getNMStateStore()).thenReturn(stateStore); + NodeStatusUpdater nodeStatusUpdater = mock(NodeStatusUpdater.class); + when(context.getNodeStatusUpdater()).thenReturn(nodeStatusUpdater); ContainerExecutor executor = mock(ContainerExecutor.class); launcher = new ContainersLauncher(context, dispatcher, executor, null, null); @@ -807,8 +817,8 @@ public class TestContainer { } when(ctxt.getServiceData()).thenReturn(serviceData); - c = new ContainerImpl(conf, dispatcher, new NMNullStateStoreService(), - ctxt, null, metrics, identifier); + c = new ContainerImpl(conf, dispatcher, ctxt, null, metrics, identifier, + context); dispatcher.register(ContainerEventType.class, new EventHandler<ContainerEvent>() { @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/b406dcaf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java index a7006e0..372e899 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java @@ -208,10 +208,11 @@ public class TestNMWebServer { BuilderUtils.newContainerToken(containerId, "127.0.0.1", 1234, user, BuilderUtils.newResource(1024, 1), currentTime + 10000L, 123, "password".getBytes(), currentTime); + Context context = mock(Context.class); Container container = - new ContainerImpl(conf, dispatcher, stateStore, launchContext, + new ContainerImpl(conf, dispatcher, launchContext, null, metrics, - BuilderUtils.newContainerTokenIdentifier(containerToken)) { + BuilderUtils.newContainerTokenIdentifier(containerToken), context) { @Override public ContainerState getContainerState() {
