From 42368b91c49e5d72a983ed919f1b9a2335ba1236 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 17 Feb 2015 01:53:58 +0900 Subject: [PATCH] Revert "YARN-1299. Improve a log message in AppSchedulingInfo by adding application id. Contributed by Ashutosh Jindal and devaraj." This reverts commit 67e3a77720cfcb0fc540e8e0c80a5d42b8140fcc. --- hadoop-yarn-project/CHANGES.txt | 3 --- .../server/resourcemanager/scheduler/AppSchedulingInfo.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ff56769d86e..f6469b19e8c 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -262,9 +262,6 @@ Release 2.7.0 - UNRELEASED YARN-3203. Correct a log message in AuxServices. (Brahma Reddy Battula via ozawa) - YARN-1299. Improve a log message in AppSchedulingInfo by adding application - id. (Ashutosh Jindal and devaraj via ozawa) - OPTIMIZATIONS YARN-2990. FairScheduler's delay-scheduling always waits for node-local and 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/AppSchedulingInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java index a9a459f95e0..3ade7f73d31 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java @@ -176,8 +176,7 @@ public class AppSchedulingInfo { // Similarly, deactivate application? if (request.getNumContainers() <= 0) { - LOG.info("checking for deactivate of application :" - + this.applicationId); + LOG.info("checking for deactivate... "); checkForDeactivation(); }