diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java index f1b0c794031..b1474b6f815 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java @@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; @@ -42,7 +43,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.monitor.RMAppLifetimeMonitor; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode; @@ -90,7 +90,7 @@ private AMLivelinessMonitor amLivelinessMonitor; private AMLivelinessMonitor amFinishingMonitor; private RMStateStore stateStore = null; - private ContainerAllocationExpirer containerAllocationExpirer; + private ContainerAllocationExpired containerAllocationExpired; private DelegationTokenRenewer delegationTokenRenewer; private AMRMTokenSecretManager amRMTokenSecretManager; private RMContainerTokenSecretManager containerTokenSecretManager; @@ -134,7 +134,7 @@ public RMActiveServiceContext() { @Private @Unstable public RMActiveServiceContext(Dispatcher rmDispatcher, - ContainerAllocationExpirer containerAllocationExpirer, + ContainerAllocationExpired containerAllocationExpired, AMLivelinessMonitor amLivelinessMonitor, AMLivelinessMonitor amFinishingMonitor, DelegationTokenRenewer delegationTokenRenewer, @@ -144,7 +144,7 @@ public RMActiveServiceContext(Dispatcher rmDispatcher, ClientToAMTokenSecretManagerInRM clientToAMTokenSecretManager, ResourceScheduler scheduler) { this(); - this.setContainerAllocationExpirer(containerAllocationExpirer); + this.setContainerAllocationExpired(containerAllocationExpired); this.setAMLivelinessMonitor(amLivelinessMonitor); this.setAMFinishingMonitor(amFinishingMonitor); this.setDelegationTokenRenewer(delegationTokenRenewer); @@ -214,8 +214,8 @@ public RMStateStore getStateStore() { @Private @Unstable - public ContainerAllocationExpirer getContainerAllocationExpirer() { - return this.containerAllocationExpirer; + public ContainerAllocationExpired getContainerAllocationExpired() { + return this.containerAllocationExpired; } @Private @@ -299,9 +299,9 @@ public void setRMDelegationTokenSecretManager( @Private @Unstable - void setContainerAllocationExpirer( - ContainerAllocationExpirer containerAllocationExpirer) { - this.containerAllocationExpirer = containerAllocationExpirer; + void setContainerAllocationExpired( + ContainerAllocationExpired containerAllocationExpired) { + this.containerAllocationExpired = containerAllocationExpired; } @Private diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContext.java index 55420bd9270..bf5b0265832 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContext.java @@ -40,7 +40,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.monitor.RMAppLifetimeMonitor; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode; @@ -84,7 +84,7 @@ AMLivelinessMonitor getAMFinishingMonitor(); - ContainerAllocationExpirer getContainerAllocationExpirer(); + ContainerAllocationExpired getContainerAllocationExpirer(); DelegationTokenRenewer getDelegationTokenRenewer(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java index 54e0281f7e8..32c0d84d1b7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java @@ -22,6 +22,7 @@ import java.net.URISyntaxException; import java.util.concurrent.ConcurrentMap; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience.Private; @@ -46,7 +47,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.monitor.RMAppLifetimeMonitor; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode; @@ -112,7 +112,7 @@ public RMContextImpl() { @VisibleForTesting // helper constructor for tests public RMContextImpl(Dispatcher rmDispatcher, - ContainerAllocationExpirer containerAllocationExpirer, + ContainerAllocationExpired containerAllocationExpired, AMLivelinessMonitor amLivelinessMonitor, AMLivelinessMonitor amFinishingMonitor, DelegationTokenRenewer delegationTokenRenewer, @@ -124,7 +124,7 @@ public RMContextImpl(Dispatcher rmDispatcher, this(); this.setDispatcher(rmDispatcher); setActiveServiceContext(new RMActiveServiceContext(rmDispatcher, - containerAllocationExpirer, amLivelinessMonitor, amFinishingMonitor, + containerAllocationExpired, amLivelinessMonitor, amFinishingMonitor, delegationTokenRenewer, appTokenSecretManager, containerTokenSecretManager, nmTokenSecretManager, clientToAMTokenSecretManager, @@ -137,7 +137,7 @@ public RMContextImpl(Dispatcher rmDispatcher, @VisibleForTesting // helper constructor for tests public RMContextImpl(Dispatcher rmDispatcher, - ContainerAllocationExpirer containerAllocationExpirer, + ContainerAllocationExpired containerAllocationExpired, AMLivelinessMonitor amLivelinessMonitor, AMLivelinessMonitor amFinishingMonitor, DelegationTokenRenewer delegationTokenRenewer, @@ -147,7 +147,7 @@ public RMContextImpl(Dispatcher rmDispatcher, ClientToAMTokenSecretManagerInRM clientToAMTokenSecretManager) { this( rmDispatcher, - containerAllocationExpirer, + containerAllocationExpired, amLivelinessMonitor, amFinishingMonitor, delegationTokenRenewer, @@ -328,8 +328,8 @@ public RMStateStore getStateStore() { } @Override - public ContainerAllocationExpirer getContainerAllocationExpirer() { - return activeServiceContext.getContainerAllocationExpirer(); + public ContainerAllocationExpired getContainerAllocationExpirer() { + return activeServiceContext.getContainerAllocationExpired(); } @Override @@ -420,9 +420,9 @@ public void setRMDelegationTokenSecretManager( } void setContainerAllocationExpirer( - ContainerAllocationExpirer containerAllocationExpirer) { + ContainerAllocationExpired containerAllocationExpired) { activeServiceContext - .setContainerAllocationExpirer(containerAllocationExpirer); + .setContainerAllocationExpired(containerAllocationExpired); } void setAMLivelinessMonitor(AMLivelinessMonitor amLivelinessMonitor) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index d97604324f7..b0d7b010bd1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -94,7 +94,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEventType; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.monitor.RMAppLifetimeMonitor; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEventType; @@ -638,7 +638,7 @@ protected static void validateConfigs(Configuration conf) { private DelegationTokenRenewer delegationTokenRenewer; private EventHandler schedulerDispatcher; private ApplicationMasterLauncher applicationMasterLauncher; - private ContainerAllocationExpirer containerAllocationExpirer; + private ContainerAllocationExpired containerAllocationExpired; private ResourceManager rm; private boolean fromActive = false; private StandByTransitionRunnable standByTransitionRunnable; @@ -656,9 +656,9 @@ protected void serviceInit(Configuration configuration) throws Exception { rmSecretManagerService = createRMSecretManagerService(); addService(rmSecretManagerService); - containerAllocationExpirer = new ContainerAllocationExpirer(rmDispatcher); - addService(containerAllocationExpirer); - rmContext.setContainerAllocationExpirer(containerAllocationExpirer); + containerAllocationExpired = new ContainerAllocationExpired(rmDispatcher); + addService(containerAllocationExpired); + rmContext.setContainerAllocationExpirer(containerAllocationExpired); AMLivelinessMonitor amLivelinessMonitor = createAMLivelinessMonitor(); addService(amLivelinessMonitor); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpirer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpired.java similarity index 92% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpirer.java rename to hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpired.java index d8198f41429..b97f98a540f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpirer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpired.java @@ -26,13 +26,13 @@ import org.apache.hadoop.yarn.util.AbstractLivelinessMonitor; @SuppressWarnings({"unchecked", "rawtypes"}) -public class ContainerAllocationExpirer extends +public class ContainerAllocationExpired extends AbstractLivelinessMonitor { private EventHandler dispatcher; - public ContainerAllocationExpirer(Dispatcher d) { - super(ContainerAllocationExpirer.class.getName()); + public ContainerAllocationExpired(Dispatcher d) { + super(ContainerAllocationExpired.class.getName()); this.dispatcher = d.getEventHandler(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerEventType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerEventType.java index a3b4b76f973..bcab9b35d73 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerEventType.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerEventType.java @@ -36,7 +36,7 @@ // Source: ApplicationMasterService->Scheduler RELEASED, - // Source: ContainerAllocationExpirer + // Source: ContainerAllocationExpired EXPIRE, RECOVER, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java index 004c170262f..671807ecdcd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java @@ -172,7 +172,7 @@ private final NodeId nodeId; private final RMContext rmContext; private final EventHandler eventHandler; - private final ContainerAllocationExpirer containerAllocationExpirer; + private final ContainerAllocationExpired containerAllocationExpired; private final String user; private final String nodeLabelExpression; @@ -239,7 +239,7 @@ public RMContainerImpl(Container container, SchedulerRequestKey schedulerKey, this.creationTime = creationTime; this.rmContext = rmContext; this.eventHandler = rmContext.getDispatcher().getEventHandler(); - this.containerAllocationExpirer = rmContext.getContainerAllocationExpirer(); + this.containerAllocationExpired = rmContext.getContainerAllocationExpirer(); this.isAMContainer = false; this.nodeLabelExpression = nodeLabelExpression; this.lastConfirmedResource = container.getResource(); @@ -600,8 +600,8 @@ public void transition(RMContainerImpl container, RMContainerEvent event) { // this anymore. container.setContainerRequest(null); - // Register with containerAllocationExpirer. - container.containerAllocationExpirer.register( + // Register with containerAllocationExpired. + container.containerAllocationExpired.register( new AllocationExpirationInfo(container.getContainerId())); // Tell the app @@ -624,8 +624,8 @@ public void transition(RMContainerImpl container, RMContainerEvent event) { (RMContainerUpdatesAcquiredEvent) event; if (acquiredEvent.isIncreasedContainer()) { // If container is increased but not started by AM, we will start - // containerAllocationExpirer for this container in this transition. - container.containerAllocationExpirer.register( + // containerAllocationExpired for this container in this transition. + container.containerAllocationExpired.register( new AllocationExpirationInfo(event.getContainerId(), true)); } } @@ -649,7 +649,7 @@ public void transition(RMContainerImpl container, RMContainerEvent event) { // - Set the lastConfirmedResource as nmContainerResource // - Unregister the allocation expirer container.lastConfirmedResource = nmContainerResource; - container.containerAllocationExpirer.unregister( + container.containerAllocationExpired.unregister( new AllocationExpirationInfo(event.getContainerId())); } else if (Resources.fitsIn(rmContainerResource, nmContainerResource)) { // If rmContainerResource < nmContainerResource, this is caused by the @@ -664,7 +664,7 @@ public void transition(RMContainerImpl container, RMContainerEvent event) { // - Unregister the allocation expirer // - Notify NM to reduce its resource to rmContainerResource container.lastConfirmedResource = rmContainerResource; - container.containerAllocationExpirer.unregister( + container.containerAllocationExpired.unregister( new AllocationExpirationInfo(event.getContainerId())); container.eventHandler.handle(new RMNodeUpdateContainerEvent( container.nodeId, @@ -779,8 +779,8 @@ private static void publishNonAMContainerEventstoATS( @Override public void transition(RMContainerImpl container, RMContainerEvent event) { - // Unregister from containerAllocationExpirer. - container.containerAllocationExpirer.unregister( + // Unregister from containerAllocationExpired. + container.containerAllocationExpired.unregister( new AllocationExpirationInfo(container.getContainerId())); // Inform node diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java index a565fe75656..4ed2df9ca10 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java @@ -77,7 +77,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppRunningOnNodeEvent; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.AllocationExpirationInfo; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerUtils; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent; @@ -146,7 +146,7 @@ /* Container Queue Information for the node.. Used by Distributed Scheduler */ private OpportunisticContainersStatus opportunisticContainersStatus; - private final ContainerAllocationExpirer containerAllocationExpirer; + private final ContainerAllocationExpired containerAllocationExpired; /* set of containers that have just launched */ private final Set launchedContainers = new HashSet(); @@ -412,7 +412,7 @@ public RMNodeImpl(NodeId nodeId, RMContext context, String hostName, this.nodeUpdateQueue = new ConcurrentLinkedQueue(); - this.containerAllocationExpirer = context.getContainerAllocationExpirer(); + this.containerAllocationExpired = context.getContainerAllocationExpirer(); } @Override @@ -1432,8 +1432,8 @@ private void handleContainerStatus(List containerStatuses) { // Just launched container. RM knows about it the first time. launchedContainers.add(containerId); newlyLaunchedContainers.add(remoteContainer); - // Unregister from containerAllocationExpirer. - containerAllocationExpirer + // Unregister from containerAllocationExpired. + containerAllocationExpired .unregister(new AllocationExpirationInfo(containerId)); } @@ -1462,8 +1462,8 @@ private void handleContainerStatus(List containerStatuses) { if (completedContainers.add(containerId)) { newlyCompletedContainers.add(remoteContainer); } - // Unregister from containerAllocationExpirer. - containerAllocationExpirer + // Unregister from containerAllocationExpired. + containerAllocationExpired .unregister(new AllocationExpirationInfo(containerId)); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/ContainerExpiredSchedulerEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/ContainerExpiredSchedulerEvent.java index c80fc4f2dcf..5c865804760 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/ContainerExpiredSchedulerEvent.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/ContainerExpiredSchedulerEvent.java @@ -19,11 +19,11 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.event; import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; /** * The {@link SchedulerEvent} which notifies that a {@link ContainerId} - * has expired, sent by {@link ContainerAllocationExpirer} + * has expired, sent by {@link ContainerAllocationExpired} * */ public class ContainerExpiredSchedulerEvent extends SchedulerEvent { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/SchedulerEventType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/SchedulerEventType.java index 869bf0ed9e4..f3d7f58bdda 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/SchedulerEventType.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/SchedulerEventType.java @@ -36,7 +36,7 @@ APP_ATTEMPT_ADDED, APP_ATTEMPT_REMOVED, - // Source: ContainerAllocationExpirer + // Source: ContainerAllocationExpired CONTAINER_EXPIRED, // Source: SchedulerAppAttempt::pullNewlyUpdatedContainer. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index adb638619b4..d7b59fabdae 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -66,7 +66,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptImpl; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; @@ -185,7 +185,7 @@ public RMContext mockRMContextWithMixedLogAggregationStatus(int n, private RMContext createMockRMContextInternal(ConcurrentMap map) { Dispatcher rmDispatcher = new AsyncDispatcher(); - ContainerAllocationExpirer containerAllocationExpirer = new ContainerAllocationExpirer( + ContainerAllocationExpired containerAllocationExpired = new ContainerAllocationExpired( rmDispatcher); AMLivelinessMonitor amLivelinessMonitor = new AMLivelinessMonitor( rmDispatcher); @@ -193,7 +193,7 @@ private RMContext createMockRMContextInternal(ConcurrentMap getRMApps() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java index 1f1e164cf5b..3c7014a3ac8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java @@ -52,7 +52,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer .AllocationExpirationInfo; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeCleanAppEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeCleanContainerEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEvent; @@ -119,7 +119,7 @@ public void setUp() throws Exception { InlineDispatcher rmDispatcher = new InlineDispatcher(); rmContext = - new RMContextImpl(rmDispatcher, mock(ContainerAllocationExpirer.class), + new RMContextImpl(rmDispatcher, mock(ContainerAllocationExpired.class), null, null, mock(DelegationTokenRenewer.class), null, null, null, null, null); NodesListManager nodesListManager = mock(NodesListManager.class); @@ -962,8 +962,8 @@ public void testReconnnectUpdate() { @Test public void testContainerExpire() throws Exception { - ContainerAllocationExpirer mockExpirer = - mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired mockExpirer = + mock(ContainerAllocationExpired.class); ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1); ApplicationAttemptId appAttemptId = diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java index 2e176cc9763..f6dc59403a5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.rmapp; import com.google.common.collect.Lists; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; @@ -72,7 +73,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt .RMAppAttemptState; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; @@ -234,8 +234,8 @@ public void setUp() throws Exception { UserGroupInformation.setConfiguration(conf); rmDispatcher = new DrainDispatcher(); - ContainerAllocationExpirer containerAllocationExpirer = - mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired containerAllocationExpirer = + mock(ContainerAllocationExpired.class); AMLivelinessMonitor amLivelinessMonitor = mock(AMLivelinessMonitor.class); AMLivelinessMonitor amFinishingMonitor = mock(AMLivelinessMonitor.class); store = mock(RMStateStore.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java index e2f80cafd40..8e72ebf9981 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java @@ -43,6 +43,7 @@ import java.util.List; import java.util.Set; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; @@ -90,7 +91,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptContainerFinishedEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptRegistrationEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptUnregistrationEvent; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerImpl; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEvent; @@ -246,8 +246,8 @@ public void setUp() throws Exception { UserGroupInformation.setConfiguration(conf); InlineDispatcher rmDispatcher = new InlineDispatcher(); - ContainerAllocationExpirer containerAllocationExpirer = - mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired containerAllocationExpired = + mock(ContainerAllocationExpired.class); amLivelinessMonitor = mock(AMLivelinessMonitor.class); amFinishingMonitor = mock(AMLivelinessMonitor.class); writer = mock(RMApplicationHistoryWriter.class); @@ -255,7 +255,7 @@ public void setUp() throws Exception { when(amRMTokenManager.getMasterKey()).thenReturn(masterKeyData); rmContext = new RMContextImpl(rmDispatcher, - containerAllocationExpirer, amLivelinessMonitor, amFinishingMonitor, + containerAllocationExpired, amLivelinessMonitor, amFinishingMonitor, null, amRMTokenManager, new RMContainerTokenSecretManager(conf), nmTokenManager, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/TestRMContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/TestRMContainerImpl.java index 256bd941972..1bbd935683f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/TestRMContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/TestRMContainerImpl.java @@ -97,7 +97,7 @@ public void testReleaseWhileRunning() { ApplicationAttemptId appAttemptId = BuilderUtils.newApplicationAttemptId( appId, 1); ContainerId containerId = BuilderUtils.newContainerId(appAttemptId, 1); - ContainerAllocationExpirer expirer = mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired expirer = mock(ContainerAllocationExpired.class); Resource resource = BuilderUtils.newResource(512, 1); Priority priority = BuilderUtils.newPriority(5); @@ -203,7 +203,7 @@ public void testExpireWhileRunning() { ApplicationAttemptId appAttemptId = BuilderUtils.newApplicationAttemptId( appId, 1); ContainerId containerId = BuilderUtils.newContainerId(appAttemptId, 1); - ContainerAllocationExpirer expirer = mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired expirer = mock(ContainerAllocationExpired.class); Resource resource = BuilderUtils.newResource(512, 1); Priority priority = BuilderUtils.newPriority(5); @@ -404,7 +404,7 @@ public void testContainerTransitionNotifyAllocationTagsManager() ApplicationAttemptId appAttemptId = BuilderUtils.newApplicationAttemptId( appId, 1); ContainerId containerId = BuilderUtils.newContainerId(appAttemptId, 1); - ContainerAllocationExpirer expirer = mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired expirer = mock(ContainerAllocationExpired.class); Resource resource = BuilderUtils.newResource(512, 1); Priority priority = BuilderUtils.newPriority(5); @@ -579,7 +579,7 @@ public void testContainerAcquiredAtKilled() { ApplicationAttemptId appAttemptId = BuilderUtils.newApplicationAttemptId( appId, 1); ContainerId containerId = BuilderUtils.newContainerId(appAttemptId, 1); - ContainerAllocationExpirer expirer = mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired expirer = mock(ContainerAllocationExpired.class); Resource resource = BuilderUtils.newResource(512, 1); Priority priority = BuilderUtils.newPriority(5); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java index d568220dc68..0aaa27749f8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestChildQueueOrder.java @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.Map; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; @@ -45,7 +46,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter; import org.apache.hadoop.yarn.server.resourcemanager.metrics.SystemMetricsPublisher; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerEventType; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerImpl; @@ -268,8 +268,8 @@ public void testSortedQueues() throws Exception { any(String.class)); Priority priority = TestUtils.createMockPriority(1); - ContainerAllocationExpirer expirer = - mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired expirer = + mock(ContainerAllocationExpired.class); DrainDispatcher drainDispatcher = new DrainDispatcher(); RMApplicationHistoryWriter writer = mock(RMApplicationHistoryWriter.class); SystemMetricsPublisher publisher = mock(SystemMetricsPublisher.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java index da0e9c9e6fc..1f8be228911 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestReservations.java @@ -34,6 +34,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.hadoop.test.GenericTestUtils; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; @@ -54,7 +55,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.metrics.SystemMetricsPublisher; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainerImpl; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ActiveUsersManager; @@ -916,8 +916,8 @@ public void testGetAppToUnreserve() throws Exception { RMApplicationHistoryWriter writer = mock(RMApplicationHistoryWriter.class); SystemMetricsPublisher publisher = mock(SystemMetricsPublisher.class); RMContext rmContext = mock(RMContext.class); - ContainerAllocationExpirer expirer = - mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired expirer = + mock(ContainerAllocationExpired.class); DrainDispatcher drainDispatcher = new DrainDispatcher(); when(rmContext.getContainerAllocationExpirer()).thenReturn(expirer); when(rmContext.getDispatcher()).thenReturn(drainDispatcher); @@ -990,8 +990,8 @@ public void testFindNodeToUnreserve() throws Exception { RMApplicationHistoryWriter writer = mock(RMApplicationHistoryWriter.class); SystemMetricsPublisher publisher = mock(SystemMetricsPublisher.class); RMContext rmContext = mock(RMContext.class); - ContainerAllocationExpirer expirer = - mock(ContainerAllocationExpirer.class); + ContainerAllocationExpired expirer = + mock(ContainerAllocationExpired.class); DrainDispatcher drainDispatcher = new DrainDispatcher(); when(rmContext.getContainerAllocationExpirer()).thenReturn(expirer); when(rmContext.getDispatcher()).thenReturn(drainDispatcher); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java index 3a64a8a19d7..290f6940da4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestUtils.java @@ -34,7 +34,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter; import org.apache.hadoop.yarn.server.resourcemanager.metrics.SystemMetricsPublisher; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; -import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; +import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpired; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp; @@ -90,8 +90,8 @@ public void register(Class eventType, }; // No op - ContainerAllocationExpirer cae = - new ContainerAllocationExpirer(nullDispatcher); + ContainerAllocationExpired cae = + new ContainerAllocationExpired(nullDispatcher); Configuration conf = new Configuration(); RMApplicationHistoryWriter writer = mock(RMApplicationHistoryWriter.class);