From eb8e2c5448f2b067e2a111a5af732219791508ba Mon Sep 17 00:00:00 2001 From: Devaraj K Date: Tue, 16 Jun 2015 14:03:22 +0530 Subject: [PATCH] YARN-3789. Improve logs for LeafQueue#activateApplications(). Contributed by Bibin A Chundatt. (cherry picked from commit b039e69bb03accef485361af301fa59f03d08d6a) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../scheduler/capacity/LeafQueue.java | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 46d50522a16..7b3c073f72b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -258,6 +258,9 @@ Release 2.8.0 - UNRELEASED YARN-3785. Support for Resource as an argument during submitApp call in MockRM test class. (Sunil G via xgong) + YARN-3789. Improve logs for LeafQueue#activateApplications(). + (Bibin A Chundatt via devaraj) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not 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/capacity/LeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java index 15d3289d1da..8e39133f604 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java @@ -56,7 +56,6 @@ import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager; import org.apache.hadoop.yarn.security.AccessType; -import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; @@ -604,7 +603,7 @@ public class LeafQueue extends AbstractCSQueue { for (Iterator i=pendingApplications.iterator(); i.hasNext(); ) { FiCaSchedulerApp application = i.next(); - + ApplicationId applicationId = application.getApplicationId(); // Check am resource limit Resource amIfStarted = Resources.add(application.getAMResource(), queueUsage.getAMUsed()); @@ -624,7 +623,9 @@ public class LeafQueue extends AbstractCSQueue { " single application in queue, it is likely set too low." + " skipping enforcement to allow at least one application to start"); } else { - LOG.info("not starting application as amIfStarted exceeds amLimit"); + LOG.info("Not activating application " + applicationId + + " as amIfStarted: " + amIfStarted + " exceeds amLimit: " + + amLimit); continue; } } @@ -645,8 +646,9 @@ public class LeafQueue extends AbstractCSQueue { " single application in queue for user, it is likely set too low." + " skipping enforcement to allow at least one application to start"); } else { - LOG.info("not starting application as amIfStarted exceeds " + - "userAmLimit"); + LOG.info("Not activating application " + applicationId + + " for user: " + user + " as userAmIfStarted: " + + userAmIfStarted + " exceeds userAmLimit: " + userAMLimit); continue; } } @@ -657,9 +659,8 @@ public class LeafQueue extends AbstractCSQueue { metrics.incAMUsed(application.getUser(), application.getAMResource()); metrics.setAMResouceLimitForUser(application.getUser(), userAMLimit); i.remove(); - LOG.info("Application " + application.getApplicationId() + - " from user: " + application.getUser() + - " activated in queue: " + getQueueName()); + LOG.info("Application " + applicationId + " from user: " + + application.getUser() + " activated in queue: " + getQueueName()); } }