Repository: hadoop Updated Branches: refs/heads/branch-2 acc90ca17 -> 2802c63ac
YARN-3617. Fix WindowsResourceCalculatorPlugin.getCpuFrequency() returning always -1. Contributed by J.Andreina. (cherry picked from commit 318d2cde7cb5c05a5f87c4ee967446bb60d28ae4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2802c63a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2802c63a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2802c63a Branch: refs/heads/branch-2 Commit: 2802c63ac3b081e2e4e0caf0589d1f6e156461c2 Parents: acc90ca Author: Devaraj K <deva...@apache.org> Authored: Wed Jun 17 13:54:09 2015 +0530 Committer: Devaraj K <deva...@apache.org> Committed: Wed Jun 17 13:55:25 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/2802c63a/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0ea3e3e..aa9e19a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -482,6 +482,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/2802c63a/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} */
