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 3F2F418F07 for ; Wed, 17 Jun 2015 08:26:28 +0000 (UTC) Received: (qmail 9458 invoked by uid 500); 17 Jun 2015 08:26:27 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 9402 invoked by uid 500); 17 Jun 2015 08:26:27 -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 9392 invoked by uid 99); 17 Jun 2015 08:26:27 -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; Wed, 17 Jun 2015 08:26:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AB43EDFFAE; Wed, 17 Jun 2015 08:26:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devaraj@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3617. Fix WindowsResourceCalculatorPlugin.getCpuFrequency() returning always -1. Contributed by J.Andreina. Date: Wed, 17 Jun 2015 08:26:27 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 5dbc8c9cb -> 318d2cde7 YARN-3617. Fix WindowsResourceCalculatorPlugin.getCpuFrequency() returning always -1. Contributed by J.Andreina. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/318d2cde Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/318d2cde Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/318d2cde Branch: refs/heads/trunk Commit: 318d2cde7cb5c05a5f87c4ee967446bb60d28ae4 Parents: 5dbc8c9 Author: Devaraj K Authored: Wed Jun 17 13:54:09 2015 +0530 Committer: Devaraj K Committed: Wed Jun 17 13:54:09 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/util/WindowsResourceCalculatorPlugin.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/318d2cde/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b61eb27..c793a31 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -530,6 +530,9 @@ Release 2.8.0 - UNRELEASED YARN-3714. AM proxy filter can not get RM webapp address from yarn.resourcemanager.hostname.rm-id. (Masatake Iwasaki via xgong) + YARN-3617. Fix WindowsResourceCalculatorPlugin.getCpuFrequency() + returning always -1. (J.Andreina via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/318d2cde/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsResourceCalculatorPlugin.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsResourceCalculatorPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsResourceCalculatorPlugin.java index 0e89118..cdbf525 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsResourceCalculatorPlugin.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/WindowsResourceCalculatorPlugin.java @@ -157,7 +157,7 @@ public class WindowsResourceCalculatorPlugin extends ResourceCalculatorPlugin { @Override public long getCpuFrequency() { refreshIfNeeded(); - return -1; + return cpuFrequencyKhz; } /** {@inheritDoc} */