From 3538f2c1b66504a8be9b668546f132569078190f Mon Sep 17 00:00:00 2001 From: Rohith Sharma K S Date: Tue, 13 Sep 2016 18:21:30 +0530 Subject: [PATCH] YARN-4205 --- .../api/records/ApplicationSubmissionContext.java | 19 +++ .../yarn/api/records/ApplicationTimeouts.java | 102 ++++++++++++++ .../apache/hadoop/yarn/conf/YarnConfiguration.java | 6 + .../src/main/proto/yarn_protos.proto | 5 + .../pb/ApplicationSubmissionContextPBImpl.java | 39 ++++++ .../records/impl/pb/ApplicationTimeoutsPBImpl.java | 68 +++++++++ .../yarn/util/AbstractLivelinessMonitor.java | 30 ++-- .../src/main/resources/yarn-default.xml | 9 ++ .../apache/hadoop/yarn/api/TestPBImplRecords.java | 10 ++ .../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 | 39 +++++- .../rmapp/RMAppLifetimeMonitor.java | 113 +++++++++++++++ .../hadoop/yarn/server/resourcemanager/MockRM.java | 24 +++- .../rmapp/TestApplicationLifetimeMonitor.java | 155 +++++++++++++++++++++ 17 files changed, 647 insertions(+), 14 deletions(-) create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationTimeouts.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationTimeoutsPBImpl.java 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/TestApplicationLifetimeMonitor.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..519353a 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,23 @@ public abstract void setLogAggregationContext( @Public @Unstable public abstract void setReservationID(ReservationId reservationID); + + /** + * Get ApplicationTimeouts of the application. + * + * @return ApplicationTimeouts of the application. + */ + @Public + @Unstable + public abstract ApplicationTimeouts getApplicationTimeouts(); + + /** + * Get ApplicationTimeouts of the application. + * + * @param applicationTimeouts for the application. + */ + @Public + @Unstable + public abstract void setApplicationTimeouts( + ApplicationTimeouts applicationTimeouts); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationTimeouts.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationTimeouts.java new file mode 100644 index 0000000..778be81 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationTimeouts.java @@ -0,0 +1,102 @@ +/** + * 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.api.records; + +import org.apache.hadoop.classification.InterfaceAudience.Public; +import org.apache.hadoop.classification.InterfaceStability.Unstable; +import org.apache.hadoop.yarn.util.Records; + +/** + * {@code ApplicationTimeouts} represents user specified timeouts on + * application. Timeouts can be life_timeout, queue_timeout, statestore_timeout. + * Currently YARN supports life_timeout only. + *

+ *