From 1db5142e9e8c6c861c89ac3d62da2a98ac584278 Mon Sep 17 00:00:00 2001 From: Rohith Sharma K S Date: Thu, 1 Sep 2016 21:43:43 +0530 Subject: [PATCH] YARN-4205 --- .../api/records/ApplicationSubmissionContext.java | 21 +++ .../apache/hadoop/yarn/conf/YarnConfiguration.java | 6 + .../src/main/proto/yarn_protos.proto | 1 + .../pb/ApplicationSubmissionContextPBImpl.java | 15 ++ .../src/main/resources/yarn-default.xml | 9 ++ .../resourcemanager/RMActiveServiceContext.java | 16 ++ .../yarn/server/resourcemanager/RMContext.java | 5 + .../yarn/server/resourcemanager/RMContextImpl.java | 12 ++ .../server/resourcemanager/ResourceManager.java | 9 ++ .../server/resourcemanager/rmapp/RMAppImpl.java | 18 +++ .../rmapp/RMAppLifetimeMonitor.java | 171 +++++++++++++++++++++ .../hadoop/yarn/server/resourcemanager/MockRM.java | 20 ++- .../TestApplicationLifetimeMonitorService.java | 157 +++++++++++++++++++ 13 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppLifetimeMonitor.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitorService.java diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java index 21cd1bb..271efa6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java @@ -535,4 +535,25 @@ public abstract void setLogAggregationContext( @Public @Unstable public abstract void setReservationID(ReservationId reservationID); + + /** + * Get the application lifetime value. + * The application will be killed if is not completed in the given time. + * + * @return application lifetime value. + */ + @Public + @Unstable + public abstract long getApplicationLifetime(); + + /** + * Set the application lifetime value. The application will be killed if is + * not completed in the given time.
+ * Note : Do not configure very less value. + * + * @param applicationLifetime application lifetime value in seconds + */ + @Public + @Unstable + public abstract void setApplicationLifetime(long applicationLifetime); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 46e3323..b57b9d4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -1529,6 +1529,12 @@ public static boolean isAclEnabled(Configuration conf) { false; + // Configurations for applicaiton life time monitor feature + public static final String RM_APPLICATION_LIFETIME_MONITOR_INTERVAL_MS = + RM_PREFIX + "application.lifetimeout-monitor.interval-ms"; + + public static final long DEFAULT_RM_APPLICATION_LIFETIME_MONITOR_INTERVAL_MS = + 60000L; /** * Interval of time the linux container executor should try cleaning up diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto index 2d6007e..e41e220 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto @@ -365,6 +365,7 @@ message ApplicationSubmissionContextProto { optional ReservationIdProto reservation_id = 15; optional string node_label_expression = 16; optional ResourceRequestProto am_container_resource_request = 17; + optional int64 application_lifetime = 18 [default = -1]; } message LogAggregationContextProto { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java index 67e3a84..fbc677a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationSubmissionContextPBImpl.java @@ -548,4 +548,19 @@ private ReservationIdPBImpl convertFromProtoFormat(ReservationIdProto p) { private ReservationIdProto convertToProtoFormat(ReservationId t) { return ((ReservationIdPBImpl) t).getProto(); } + + @Override + public long getApplicationLifetime() { + ApplicationSubmissionContextProtoOrBuilder p = viaProto ? proto : builder; + if (!p.hasApplicationLifetime()) { + return -1; + } + return (p.getApplicationLifetime()); + } + + @Override + public void setApplicationLifetime(long applicationLifetime) { + maybeInitBuilder(); + builder.setApplicationLifetime(applicationLifetime); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index e956507..7e94d01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -3069,4 +3069,13 @@ yarn.resourcemanager.node-removal-untracked.timeout-ms 60000 + + + + The RMAppLifeTimeMonitorService uses this value as monitor interval. + + yarn.resourcemanager.application.lifetimeout-monitor.interval-ms + 60000 + + 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 caa0ff13..0bf5f21 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 @@ -37,6 +37,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore; import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppLifetimeMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; @@ -105,6 +106,8 @@ private boolean isSchedulerReady = false; private PlacementManager queuePlacementManager = null; + private RMAppLifetimeMonitor rmAppLifetimeMonitor; + public RMActiveServiceContext() { queuePlacementManager = new PlacementManager(); } @@ -467,4 +470,17 @@ public PlacementManager getQueuePlacementManager() { public void setQueuePlacementManager(PlacementManager placementMgr) { this.queuePlacementManager = placementMgr; } + + @Private + @Unstable + public void setRMAppLifetimeMonitor( + RMAppLifetimeMonitor rmAppLifetimeMonitor) { + this.rmAppLifetimeMonitor = rmAppLifetimeMonitor; + } + + @Private + @Unstable + public RMAppLifetimeMonitor getRMAppLifetimeMonitor() { + return this.rmAppLifetimeMonitor; + } } 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 2ba445c..f313a52 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 @@ -35,6 +35,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore; import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppLifetimeMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; @@ -149,4 +150,8 @@ void setRMDelegatedNodeLabelsUpdater( LeaderElectorService getLeaderElectorService(); QueueLimitCalculator getNodeManagerQueueLimitCalculator(); + + void setRMAppLifetimeMonitor(RMAppLifetimeMonitor rmAppLifetimeMonitor); + + RMAppLifetimeMonitor getRMAppLifetimeMonitor(); } 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 1e702de..b6d4fb8 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 @@ -39,6 +39,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore; import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppLifetimeMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; @@ -499,4 +500,15 @@ public void setContainerQueueLimitCalculator( QueueLimitCalculator limitCalculator) { this.queueLimitCalculator = limitCalculator; } + + @Override + public void setRMAppLifetimeMonitor( + RMAppLifetimeMonitor rmAppLifeTimeMonitor) { + this.activeServiceContext.setRMAppLifetimeMonitor(rmAppLifeTimeMonitor); + } + + @Override + public RMAppLifetimeMonitor getRMAppLifetimeMonitor() { + return this.activeServiceContext.getRMAppLifetimeMonitor(); + } } 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 bf72fc1..d1c3e7c 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 @@ -92,6 +92,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppEvent; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppEventType; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppLifetimeMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.AMLivelinessMonitor; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEvent; @@ -556,6 +557,10 @@ protected void serviceInit(Configuration configuration) throws Exception { addService(amFinishingMonitor); rmContext.setAMFinishingMonitor(amFinishingMonitor); + RMAppLifetimeMonitor rmAppLifetimeMonitor = createRMAppLifetimeMonitor(); + addService(rmAppLifetimeMonitor); + rmContext.setRMAppLifetimeMonitor(rmAppLifetimeMonitor); + RMNodeLabelsManager nlm = createNodeLabelManager(); nlm.setRMContext(rmContext); addService(nlm); @@ -1398,4 +1403,8 @@ private static void printUsage(PrintStream out) { out.println(" " + "[-remove-application-from-state-store ]" + "\n"); } + + protected RMAppLifetimeMonitor createRMAppLifetimeMonitor() { + return new RMAppLifetimeMonitor(this.rmContext); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index e5bde32..2106bc6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -1106,6 +1106,15 @@ public RMAppState transition(RMAppImpl app, RMAppEvent event) { } } + long applicationLifetime = app.submissionContext.getApplicationLifetime(); + if (applicationLifetime > 0) { + app.rmContext.getRMAppLifetimeMonitor().register(app.applicationId, + applicationLifetime * 1000); + LOG.info("Application " + app.applicationId + + " is registered with Application lifetime monitor after recovery. " + + "The lifetime configured is " + applicationLifetime + " seconds"); + } + // No existent attempts means the attempt associated with this app was not // started or started but not yet saved. if (app.attempts.isEmpty()) { @@ -1209,6 +1218,15 @@ private String getAppAttemptFailedDiagnostics(RMAppEvent event) { @Override public void transition(RMAppImpl app, RMAppEvent event) { + long applicationLifetime = app.submissionContext.getApplicationLifetime(); + if (applicationLifetime > 0) { + app.rmContext.getRMAppLifetimeMonitor().register(app.applicationId, + applicationLifetime * 1000); + LOG.info("Application " + app.applicationId + + " is registered with Application lifetime monitor. " + + "The lifetime configured is " + applicationLifetime + " seconds"); + } + // If recovery is enabled then store the application information in a // non-blocking call so make sure that RM has stored the information // needed to restart the AM after RM restart without further client diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppLifetimeMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppLifetimeMonitor.java new file mode 100644 index 0000000..bb47f42 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppLifetimeMonitor.java @@ -0,0 +1,171 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.rmapp; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.service.AbstractService; +import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; +import org.apache.hadoop.yarn.server.resourcemanager.RMContext; +import org.apache.hadoop.yarn.util.Clock; +import org.apache.hadoop.yarn.util.SystemClock; + +/** + * This service will monitor the applications against the lifetime value given. + * The applications will be killed if it running beyond the given time. + */ +public class RMAppLifetimeMonitor extends AbstractService { + + private static final Log LOG = LogFactory.getLog(RMAppLifetimeMonitor.class); + + private RMContext rmContext; + + private Clock clock; + private Thread rmAppLifeTimeMonitorThread = null; + private volatile boolean stopped = false; + + private long monitorInterval; + + private ConcurrentMap monitoredApps = + new ConcurrentHashMap(); + + public RMAppLifetimeMonitor(RMContext rmContext) { + super(RMAppLifetimeMonitor.class.getName()); + this.rmContext = rmContext; + } + + @Override + protected void serviceInit(Configuration conf) throws Exception { + super.serviceInit(conf); + clock = SystemClock.getInstance(); + monitorInterval = conf.getLong( + YarnConfiguration.RM_APPLICATION_LIFETIME_MONITOR_INTERVAL_MS, + YarnConfiguration.DEFAULT_RM_APPLICATION_LIFETIME_MONITOR_INTERVAL_MS); + if (monitorInterval <= 0) { + monitorInterval = + YarnConfiguration.DEFAULT_RM_APPLICATION_LIFETIME_MONITOR_INTERVAL_MS; + } + LOG.info("Application lifelime monitor interval set to " + + this.monitorInterval + " ms."); + } + + @Override + protected void serviceStart() throws Exception { + rmAppLifeTimeMonitorThread = new RMAppLifeTimeMonitorThread(); + rmAppLifeTimeMonitorThread.setName("RMAppLifeTimeMonitorService"); + rmAppLifeTimeMonitorThread.setDaemon(true); + rmAppLifeTimeMonitorThread.start(); + LOG.info("Successfully started RMAppLifeTimeMonitorService"); + } + + private class RMAppLifeTimeMonitorThread extends Thread { + + @SuppressWarnings("unchecked") + @Override + public void run() { + if (LOG.isDebugEnabled()) { + LOG.debug("Starting RMAppLifeTimeMonitorThread."); + } + long applicationlifetime; + RMApp application = null; + while (!stopped && !Thread.currentThread().isInterrupted()) { + try { + for (Map.Entry e : monitoredApps.entrySet()) { + ApplicationId appId = e.getKey(); + applicationlifetime = e.getValue(); + application = rmContext.getRMApps().get(appId); + if (application == null) { + LOG.info("Registered application" + appId + + " for lifetime monitor not found in RMContext"); + continue; + } + if (!isApplicationInFinalState(application)) { + long currentTime = clock.getTime(); + if (LOG.isDebugEnabled()) { + LOG.debug("Application : " + application.getApplicationId() + + " lifetime : " + applicationlifetime + " " + + " currentTime : " + currentTime + " SubmitTime : " + + application.getSubmitTime()); + } + if ((currentTime + - application.getSubmitTime()) > applicationlifetime) { + rmContext.getDispatcher().getEventHandler() + .handle(new RMAppEvent(application.getApplicationId(), + RMAppEventType.KILL, + "Application killed due to exceeding its lifetime period " + + applicationlifetime + " seconds")); + } + } else { + monitoredApps.remove(application.getApplicationId()); + LOG.info("Application " + application.getApplicationId() + + " is removed from the lifetime" + + " monitor since it is completed"); + } + } + } catch (YarnRuntimeException runexe) { + LOG.error("YarnRuntimeException exception occured while" + + " killing application based on application lifetime exhausted" + + runexe); + } catch (Exception exe) { + LOG.warn("Exception occurred while killing applicaiton " + + application.getApplicationId(), exe); + } + try { + Thread.sleep(monitorInterval); + } catch (InterruptedException e1) { + if (LOG.isDebugEnabled()) { + LOG.debug("RMAppLifeTimeMonitorThread got interrupted Exception." + + " Continuing with next iteration."); + } + } + } + } + + private boolean isApplicationInFinalState(RMApp application) { + return application.isAppFinalStateStored() + || application.getState() == RMAppState.FINAL_SAVING + || application.getState() == RMAppState.KILLING; + } + } + + @Override + protected void serviceStop() throws Exception { + stopped = true; + if (rmAppLifeTimeMonitorThread != null) { + rmAppLifeTimeMonitorThread.interrupt(); + try { + rmAppLifeTimeMonitorThread.join(); + } catch (InterruptedException ie) { + LOG.warn("Interrupted Exception while stopping"); + } + } + super.serviceStop(); + } + + public void register(ApplicationId ob, long timeOut) { + monitoredApps.putIfAbsent(ob, timeOut); + } +} \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java index f843261..5b9b8f0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java @@ -460,7 +460,7 @@ public RMApp submitApp(int masterMemory, String name, String user, return submitApp(resource, name, user, acls, false, queue, super.getConfig().getInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS), null, null, true, false, - false, null, 0, null, true, priority, amLabel); + false, null, 0, null, true, priority, amLabel, -1); } public RMApp submitApp(Resource resource, String name, String user, @@ -561,7 +561,7 @@ public RMApp submitApp(Resource capability, String name, String user, return submitApp(capability, name, user, acls, unmanaged, queue, maxAppAttempts, ts, appType, waitForAccepted, keepContainers, isAppIdProvided, applicationId, attemptFailuresValidityInterval, - logAggregationContext, cancelTokensWhenComplete, priority, ""); + logAggregationContext, cancelTokensWhenComplete, priority, "", -1); } public RMApp submitApp(Resource capability, String name, String user, @@ -570,7 +570,8 @@ public RMApp submitApp(Resource capability, String name, String user, boolean waitForAccepted, boolean keepContainers, boolean isAppIdProvided, ApplicationId applicationId, long attemptFailuresValidityInterval, LogAggregationContext logAggregationContext, - boolean cancelTokensWhenComplete, Priority priority, String amLabel) + boolean cancelTokensWhenComplete, Priority priority, String amLabel, + long applicationLifetime) throws Exception { ApplicationId appId = isAppIdProvided ? applicationId : null; ApplicationClientProtocol client = getClientRMService(); @@ -587,6 +588,9 @@ public RMApp submitApp(Resource capability, String name, String user, sub.setApplicationId(appId); sub.setApplicationName(name); sub.setMaxAppAttempts(maxAppAttempts); + if (-1 != applicationLifetime) { + sub.setApplicationLifetime(applicationLifetime); + } if (unmanaged) { sub.setUnmanagedAM(true); } @@ -1073,4 +1077,14 @@ public void waitForAppRemovedFromScheduler(ApplicationId appId, !apps.containsKey(appId)); LOG.info("app is removed from scheduler, " + appId); } + public RMApp submitApp(int masterMemory, Priority priority, + long applicationLifeTime) throws Exception { + Resource resource = Resource.newInstance(masterMemory, 0); + return submitApp( + resource,"",UserGroupInformation.getCurrentUser().getShortUserName(), + null,false,null, + super.getConfig().getInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, + YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS), null, null, true, + false, false, null, 0, null, true, priority, null, applicationLifeTime); + } } 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/TestApplicationLifetimeMonitorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitorService.java new file mode 100644 index 0000000..aee8196 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitorService.java @@ -0,0 +1,157 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.rmapp; + +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.MockAM; +import org.apache.hadoop.yarn.server.resourcemanager.MockNM; +import org.apache.hadoop.yarn.server.resourcemanager.MockRM; +import org.apache.hadoop.yarn.server.resourcemanager.recovery.MemoryRMStateStore; +import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; +import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * Test class for application life time monitor feature test. + */ +public class TestApplicationLifetimeMonitorService { + private final int GB = 1024; + + private YarnConfiguration conf; + + @Before + public void setup() throws IOException { + conf = new YarnConfiguration(); + Logger rootLogger = LogManager.getRootLogger(); + rootLogger.setLevel(Level.DEBUG); + UserGroupInformation.setConfiguration(conf); + conf.setBoolean(YarnConfiguration.RECOVERY_ENABLED, true); + conf.setBoolean(YarnConfiguration.RM_WORK_PRESERVING_RECOVERY_ENABLED, + false); + conf.set(YarnConfiguration.RM_STORE, MemoryRMStateStore.class.getName()); + conf.setLong(YarnConfiguration.RM_APPLICATION_LIFETIME_MONITOR_INTERVAL_MS, + 3000L); + } + + @Test + public void testApplicationLifeTimeMonitor() throws Exception { + MockRM rm = null; + try { + rm = new MockRM(conf); + rm.start(); + Priority appPriority = Priority.newInstance(0); + MockNM nm1 = rm.registerNode("127.0.0.1:1234", 16 * GB); + RMApp app1 = rm.submitApp(1 * GB, appPriority, 10); + nm1.nodeHeartbeat(true); + // Send launch Event + MockAM am1 = + rm.sendAMLaunched(app1.getCurrentAppAttempt().getAppAttemptId()); + am1.registerAppAttempt(); + rm.waitForState(app1.getApplicationId(), RMAppState.KILLED); + Assert.assertTrue("Applicaiton killed before life timeout value", + (System.currentTimeMillis() - app1.getSubmitTime()) > 5000); + } finally { + stopRM(rm); + } + } + + @Test + public void testAppLifeTimeMonitorAfterRecovery() throws Exception { + MockRM rm1 = null; + MockRM rm2 = null; + try { + conf.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, + YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS); + + MemoryRMStateStore memStore = new MemoryRMStateStore(); + memStore.init(conf); + // start RM + rm1 = createMockRM(conf, memStore); + rm1.start(); + // Start NM + MockNM nm1 = + new MockNM("127.0.0.1:1234", 15120, rm1.getResourceTrackerService()); + nm1.registerNode(); + nm1.nodeHeartbeat(true); + // Submit APP with timeout + Priority appPriority = Priority.newInstance(0); + RMApp app1 = rm1.submitApp(1 * GB, appPriority, 10); + nm1.nodeHeartbeat(true); + // assert app1 attempt is saved + RMAppAttempt attempt1 = app1.getCurrentAppAttempt(); + ApplicationAttemptId attemptId1 = attempt1.getAppAttemptId(); + rm1.waitForState(attemptId1, RMAppAttemptState.ALLOCATED); + // launch the AM + MockAM am1 = rm1.sendAMLaunched(attempt1.getAppAttemptId()); + am1.registerAppAttempt(); + // Start Second RM + rm2 = createMockRM(conf, memStore); + rm2.start(); + // change NM to point to new RM + nm1.setResourceTrackerService(rm2.getResourceTrackerService()); + RMApp loadedApp1 = + rm2.getRMContext().getRMApps().get(app1.getApplicationId()); + rm2.waitForState(loadedApp1.getApplicationId(), RMAppState.ACCEPTED); + am1.setAMRMProtocol(rm2.getApplicationMasterService(), + rm2.getRMContext()); + // new NM to represent NM re-register + nm1 = + new MockNM("127.0.0.1:1234", 15120, rm2.getResourceTrackerService()); + attemptId1 = attempt1.getAppAttemptId(); + rm2.waitForState(attemptId1, RMAppAttemptState.KILLED); + Assert.assertTrue( + "Applicaiton killed before life timeout value. Finish time : " + + loadedApp1.getFinishTime() + " submit Time : " + + loadedApp1.getSubmitTime(), + (System.currentTimeMillis() - loadedApp1.getSubmitTime()) >= 10000); + } finally { + stopRM(rm1); + stopRM(rm2); + } + } + + /** + * + * @return a new MockRM that will be stopped at the end of the test. + */ + private MockRM createMockRM(YarnConfiguration conf, RMStateStore store) { + MockRM rm = new MockRM(conf, store); + return rm; + } + + private void stopRM(MockRM rm) { + if (rm != null) { + rm.stop(); + } + } +} -- 2.7.4 (Apple Git-66)