From e0a356fee3a885a2d61ced82bfd8d0969ccd05fa Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Fri, 5 Feb 2016 10:37:07 -0800 Subject: [PATCH] HADOOP-12771. Fix typo in JvmPauseMonitor#getNumGcWarnThreadholdExceeded. Contributed by Xiaobing Zhou. (cherry picked from commit 5d00067ca7f1460bbda1330e7329205a7b1ce019) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/metrics2/source/JvmMetrics.java | 2 +- .../src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4271c366a2e..db62325b418 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1025,6 +1025,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12735. core-default.xml misspells hadoop.workaround.non.threadsafe.getpwuid (Ray Chiang via cmccabe) + HADOOP-12771. Fix typo in JvmPauseMonitor#getNumGcWarnThreadholdExceeded. + (Xiaobing Zhou via xyao) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java index 164aa9340c1..a6de50ba38d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java @@ -140,7 +140,7 @@ public class JvmMetrics implements MetricsSource { if (pauseMonitor != null) { rb.addCounter(GcNumWarnThresholdExceeded, - pauseMonitor.getNumGcWarnThreadholdExceeded()); + pauseMonitor.getNumGcWarnThresholdExceeded()); rb.addCounter(GcNumInfoThresholdExceeded, pauseMonitor.getNumGcInfoThresholdExceeded()); rb.addCounter(GcTotalExtraSleepTime, diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java index 17a19521364..80d4468dc55 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/JvmPauseMonitor.java @@ -106,7 +106,7 @@ public class JvmPauseMonitor extends AbstractService { return monitorThread != null; } - public long getNumGcWarnThreadholdExceeded() { + public long getNumGcWarnThresholdExceeded() { return numGcWarnThresholdExceeded; }