Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3D0F17914 for ; Fri, 31 Oct 2014 06:53:47 +0000 (UTC) Received: (qmail 31569 invoked by uid 500); 31 Oct 2014 06:53:47 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 31476 invoked by uid 500); 31 Oct 2014 06:53:47 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 31460 invoked by uid 99); 31 Oct 2014 06:53:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 06:53:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 42F2EA07406; Fri, 31 Oct 2014 06:53:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rbalamohan@apache.org To: commits@tez.apache.org Date: Fri, 31 Oct 2014 06:53:48 -0000 Message-Id: In-Reply-To: <6f15ae948e8e415e88ba74861bfa705e@git.apache.org> References: <6f15ae948e8e415e88ba74861bfa705e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: TEZ-1725. Fix nanosecond to millis conversion in TezMxBeanResourceCalculator (Rajesh Balamohan) (Cherry picked from commit b66ff72cc02d333d36c312562b7f06ac174e9830) TEZ-1725. Fix nanosecond to millis conversion in TezMxBeanResourceCalculator (Rajesh Balamohan) (Cherry picked from commit b66ff72cc02d333d36c312562b7f06ac174e9830) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/837a8c0f Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/837a8c0f Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/837a8c0f Branch: refs/heads/branch-0.5 Commit: 837a8c0f2974be03d840532a58ec764c385dc2d4 Parents: 2a9a105 Author: Rajesh Balamohan Authored: Fri Oct 31 12:22:59 2014 +0530 Committer: Rajesh Balamohan Committed: Fri Oct 31 12:23:13 2014 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-plugins/pom.xml | 4 +++- .../java/org/apache/tez/util/TezMxBeanResourceCalculator.java | 5 +---- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/837a8c0f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 77626f0..c3844b5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -88,6 +88,7 @@ ALL CHANGES: TEZ-1703. Exception handling for InputInitializer. TEZ-1698. Cut down on ResourceCalculatorProcessTree overheads in Tez. TEZ-1703. addendum - fix flaky test. + TEZ-1725. Fix nanosecond to millis conversion in TezMxBeanResourceCalculator. Release 0.5.1: 2014-10-02 http://git-wip-us.apache.org/repos/asf/tez/blob/837a8c0f/tez-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/tez-plugins/pom.xml b/tez-plugins/pom.xml index 25bc311..de1a54f 100644 --- a/tez-plugins/pom.xml +++ b/tez-plugins/pom.xml @@ -30,7 +30,9 @@ hadoop24 - true + + !skipATS + tez-yarn-timeline-history http://git-wip-us.apache.org/repos/asf/tez/blob/837a8c0f/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java b/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java index 330a2fd..4aa8f85 100644 --- a/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java +++ b/tez-plugins/tez-mbeans-resource-calculator/src/main/java/org/apache/tez/util/TezMxBeanResourceCalculator.java @@ -31,7 +31,6 @@ public class TezMxBeanResourceCalculator extends ResourceCalculatorProcessTree { private final com.sun.management.OperatingSystemMXBean osBean; private final Runtime runtime; - private final AtomicLong cumulativeCPU; /** * Create process-tree instance with specified root process. @@ -45,7 +44,6 @@ public class TezMxBeanResourceCalculator extends ResourceCalculatorProcessTree { runtime = Runtime.getRuntime(); osBean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); - cumulativeCPU = new AtomicLong(); } @Override public void updateProcessTree() { @@ -67,8 +65,7 @@ public class TezMxBeanResourceCalculator extends ResourceCalculatorProcessTree { @Override public long getCumulativeCpuTime() { //convert to milliseconds - return TimeUnit.MILLISECONDS.convert(cumulativeCPU.addAndGet(osBean.getProcessCpuTime()), - TimeUnit.MILLISECONDS); + return TimeUnit.MILLISECONDS.convert(osBean.getProcessCpuTime(), TimeUnit.NANOSECONDS); } @Override public boolean checkPidPgrpidForMatch() {