apache · wuyinxian124 · Jul 23, 2019
diff --git a/...r/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMActiveServiceContext.java b/...r/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 @@ public class RMActiveServiceContext {
   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 ConcurrentMap<NodeId, RMNode> getInactiveRMNodes() {
 
   @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/...esourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContext.java b/...esourcemanager/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 @@ public interface RMContext extends ApplicationMasterServiceContext {
 
   AMLivelinessMonitor getAMFinishingMonitor();
 
-  ContainerAllocationExpirer getContainerAllocationExpirer();
+  ContainerAllocationExpired getContainerAllocationExpirer();
 
   DelegationTokenRenewer getDelegationTokenRenewer();
 

diff --git a/...rcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java b/...rcemanager/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 ConcurrentMap<NodeId, RMNode> getInactiveRMNodes() {
   }
 
   @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/...emanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/...emanager/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 @@ public class RMActiveServices extends CompositeService {
     private DelegationTokenRenewer delegationTokenRenewer;
     private EventHandler<SchedulerEvent> 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/...container/ContainerAllocationExpirer.java → ...container/ContainerAllocationExpired.java b/...container/ContainerAllocationExpirer.java → ...container/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<AllocationExpirationInfo> {
 
   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/.../java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerEventType.java b/.../java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerEventType.java
@@ -36,7 +36,7 @@ public enum RMContainerEventType {
   // Source: ApplicationMasterService->Scheduler
   RELEASED,
 
-  // Source: ContainerAllocationExpirer  
+  // Source: ContainerAllocationExpired
   EXPIRE,
 
   RECOVER,

diff --git a/.../main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java b/.../main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/RMContainerImpl.java
@@ -172,7 +172,7 @@ RMContainerEventType.RESERVED, new ContainerReservedTransition())
   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 final class KillTransition extends FinishedTransition {
     @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/...anager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java b/...anager/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 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
   /* 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<ContainerId> launchedContainers =
     new HashSet<ContainerId>();
@@ -412,7 +412,7 @@ public RMNodeImpl(NodeId nodeId, RMContext context, String hostName,
 
     this.nodeUpdateQueue = new ConcurrentLinkedQueue<UpdatedContainerInfo>();
 
-    this.containerAllocationExpirer = context.getContainerAllocationExpirer();
+    this.containerAllocationExpired = context.getContainerAllocationExpirer();
   }
 
   @Override
@@ -1432,8 +1432,8 @@ private void handleContainerStatus(List<ContainerStatus> 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<ContainerStatus> containerStatuses) {
         if (completedContainers.add(containerId)) {
           newlyCompletedContainers.add(remoteContainer);
         }
-        // Unregister from containerAllocationExpirer.
-        containerAllocationExpirer
+        // Unregister from containerAllocationExpired.
+        containerAllocationExpired
             .unregister(new AllocationExpirationInfo(containerId));
       }
     }

diff --git a/...he/hadoop/yarn/server/resourcemanager/scheduler/event/ContainerExpiredSchedulerEvent.java b/...he/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/...ava/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/SchedulerEventType.java b/...ava/org/apache/hadoop/yarn/server/resourcemanager/scheduler/event/SchedulerEventType.java
@@ -36,7 +36,7 @@ public enum SchedulerEventType {
   APP_ATTEMPT_ADDED,
   APP_ATTEMPT_REMOVED,
 
-  // Source: ContainerAllocationExpirer
+  // Source: ContainerAllocationExpired
   CONTAINER_EXPIRED,
 
   // Source: SchedulerAppAttempt::pullNewlyUpdatedContainer.

diff --git a/...cemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/...cemanager/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,15 +185,15 @@ private ConcurrentMap<ApplicationId, RMApp> createRMAppsMapMixedLogAggStatus(
 
   private RMContext createMockRMContextInternal(ConcurrentMap<ApplicationId, RMApp> map) {
     Dispatcher rmDispatcher = new AsyncDispatcher();
-    ContainerAllocationExpirer containerAllocationExpirer = new ContainerAllocationExpirer(
+    ContainerAllocationExpired containerAllocationExpired = new ContainerAllocationExpired(
             rmDispatcher);
     AMLivelinessMonitor amLivelinessMonitor = new AMLivelinessMonitor(
             rmDispatcher);
     AMLivelinessMonitor amFinishingMonitor = new AMLivelinessMonitor(
             rmDispatcher);
     RMApplicationHistoryWriter writer = mock(RMApplicationHistoryWriter.class);
     RMContext context = new RMContextImpl(rmDispatcher,
-            containerAllocationExpirer, amLivelinessMonitor, amFinishingMonitor,
+            containerAllocationExpired, amLivelinessMonitor, amFinishingMonitor,
             null, null, null, null, null) {
       @Override
       public ConcurrentMap<ApplicationId, RMApp> getRMApps() {