You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2017/09/11 19:48:15 UTC
hadoop git commit: YARN-7181. CPUTimeTracker.updateElapsedJiffies can
report negative usage. (Miklos Szegedi via Haibo Chen)
Repository: hadoop
Updated Branches:
refs/heads/trunk de9994bd8 -> d2d8f665e
YARN-7181. CPUTimeTracker.updateElapsedJiffies can report negative usage. (Miklos Szegedi via Haibo Chen)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d2d8f665
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d2d8f665
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d2d8f665
Branch: refs/heads/trunk
Commit: d2d8f665e62a6ddfe20457fb3a07cc2bea9a856b
Parents: de9994b
Author: Haibo Chen <ha...@apache.org>
Authored: Mon Sep 11 12:42:17 2017 -0700
Committer: Haibo Chen <ha...@apache.org>
Committed: Mon Sep 11 12:47:55 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/util/CpuTimeTracker.java | 4 +-
.../apache/hadoop/util/TestCpuTimeTracker.java | 52 ++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2d8f665/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CpuTimeTracker.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CpuTimeTracker.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CpuTimeTracker.java
index 3f17c9a..b4ebe86 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CpuTimeTracker.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/CpuTimeTracker.java
@@ -97,7 +97,9 @@ public class CpuTimeTracker {
* @param newTime new sample time
*/
public void updateElapsedJiffies(BigInteger elapsedJiffies, long newTime) {
- cumulativeCpuTime = elapsedJiffies.multiply(jiffyLengthInMillis);
+ BigInteger newValue = elapsedJiffies.multiply(jiffyLengthInMillis);
+ cumulativeCpuTime = newValue.compareTo(cumulativeCpuTime) >= 0 ?
+ newValue : cumulativeCpuTime;
sampleTime = newTime;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2d8f665/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestCpuTimeTracker.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestCpuTimeTracker.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestCpuTimeTracker.java
new file mode 100644
index 0000000..6246672
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestCpuTimeTracker.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.util;
+
+import org.junit.Test;
+import java.math.BigInteger;
+import static org.junit.Assert.assertTrue;
+
+public class TestCpuTimeTracker {
+ @Test
+ public void test() throws InterruptedException {
+ CpuTimeTracker tracker = new CpuTimeTracker(10);
+ tracker.updateElapsedJiffies(
+ BigInteger.valueOf(100),
+ System.currentTimeMillis());
+ float val1 = tracker.getCpuTrackerUsagePercent();
+ assertTrue(
+ "Not invalid CPU usage",
+ val1 == -1.0);
+ Thread.sleep(1000);
+ tracker.updateElapsedJiffies(
+ BigInteger.valueOf(200),
+ System.currentTimeMillis());
+ float val2 = tracker.getCpuTrackerUsagePercent();
+ assertTrue(
+ "Not positive CPU usage",
+ val2 > 0);
+ Thread.sleep(1000);
+ tracker.updateElapsedJiffies(
+ BigInteger.valueOf(0),
+ System.currentTimeMillis());
+ float val3 = tracker.getCpuTrackerUsagePercent();
+ assertTrue(
+ "Not positive CPU usage",
+ val3 == 0.0);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org