Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10062. race condition in MetricsSystemImpl#publishMetricsNow that causes incorrect results. (Contributed by Sangjin Lee) 

(cherry picked from commit 0b567f4246)
This commit is contained in:
Junping Du 2015-02-04 19:10:52 -08:00
parent ad4b243586
commit f59b698fc9
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -485,6 +485,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11549. flaky test detection tool failed to handle special control HADOOP-11549. flaky test detection tool failed to handle special control
characters in test result. (Yongjun Zhang via aajisaka) characters in test result. (Yongjun Zhang via aajisaka)
HADOOP-10062. race condition in MetricsSystemImpl#publishMetricsNow that
causes incorrect results. (Sangjin Lee via junping_du)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
View File

@ -387,7 +387,7 @@ public class MetricsSystemImpl extends MetricsSystem implements MetricsSource {
* Requests an immediate publish of all metrics from sources to sinks. * Requests an immediate publish of all metrics from sources to sinks.
*/ */
@Override @Override
public void publishMetricsNow() { public synchronized void publishMetricsNow() {
if (sinks.size() > 0) { if (sinks.size() > 0) {
publishMetrics(sampleMetrics(), true); publishMetrics(sampleMetrics(), true);
} }

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
View File

@ -190,7 +190,7 @@ public class TestMetricsSystemImpl {
threads[i] = new Thread(new Runnable() { threads[i] = new Thread(new Runnable() {
private boolean safeAwait(int mySource, CyclicBarrier barrier) { private boolean safeAwait(int mySource, CyclicBarrier barrier) {
try { try {
barrier1.await(2, TimeUnit.SECONDS); barrier.await(2, TimeUnit.SECONDS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
results[mySource] = "Interrupted"; results[mySource] = "Interrupted";
return false; return false;