Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39D53107BC for ; Mon, 16 Feb 2015 16:54:46 +0000 (UTC) Received: (qmail 88250 invoked by uid 500); 16 Feb 2015 16:54:45 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 88184 invoked by uid 500); 16 Feb 2015 16:54:45 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 88169 invoked by uid 99); 16 Feb 2015 16:54:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Feb 2015 16:54:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1369E03E9; Mon, 16 Feb 2015 16:54:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ozawa@apache.org To: common-commits@hadoop.apache.org Date: Mon, 16 Feb 2015 16:54:45 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hadoop git commit: Revert "YARN-1299. Improve a log message in AppSchedulingInfo by adding application id. Contributed by Ashutosh Jindal and devaraj." Repository: hadoop Updated Branches: refs/heads/trunk 9aae81c93 -> 556386a07 Revert "YARN-1299. Improve a log message in AppSchedulingInfo by adding application id. Contributed by Ashutosh Jindal and devaraj." This reverts commit 9aae81c93421874b726c7b6ff970895c429e502d. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3f32357c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3f32357c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3f32357c Branch: refs/heads/trunk Commit: 3f32357c368f4efac33835d719641c961f93a0be Parents: 9aae81c Author: Tsuyoshi Ozawa Authored: Tue Feb 17 01:52:22 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Tue Feb 17 01:52:22 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 --- .../yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3f32357c/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index bb145eb..7161dc3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -298,9 +298,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/3f32357c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java ---------------------------------------------------------------------- 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 a9a459f..3ade7f7 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(); }