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

HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Brahma Reddy Battula.

This commit is contained in:
Tsuyoshi Ozawa 2015-05-14 10:20:45 +09:00
parent 0e85044e26
commit 4356e8a5ef
2 changed files with 10 additions and 10 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

@ -674,6 +674,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out
even in debug level. (Junping Du via wheat9) even in debug level. (Junping Du via wheat9)
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
(Brahma Reddy Battula via ozawa)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

17
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
View File

@ -154,31 +154,28 @@ public MBeanInfo getMBeanInfo() {
private void updateJmxCache() { private void updateJmxCache() {
boolean getAllMetrics = false; boolean getAllMetrics = false;
synchronized(this) { synchronized (this) {
if (Time.now() - jmxCacheTS >= jmxCacheTTL) { if (Time.now() - jmxCacheTS >= jmxCacheTTL) {
// temporarilly advance the expiry while updating the cache // temporarilly advance the expiry while updating the cache
jmxCacheTS = Time.now() + jmxCacheTTL; jmxCacheTS = Time.now() + jmxCacheTTL;
if (lastRecs == null) { if (lastRecs == null) {
getAllMetrics = true; getAllMetrics = true;
} }
} } else {
else {
return; return;
} }
}
if (getAllMetrics) { if (getAllMetrics) {
MetricsCollectorImpl builder = new MetricsCollectorImpl(); MetricsCollectorImpl builder = new MetricsCollectorImpl();
getMetrics(builder, true); getMetrics(builder, true);
} }
synchronized(this) {
updateAttrCache(); updateAttrCache();
if (getAllMetrics) { if (getAllMetrics) {
updateInfoCache(); updateInfoCache();
} }
jmxCacheTS = Time.now(); jmxCacheTS = Time.now();
lastRecs = null; // in case regular interval update is not running lastRecs = null; // in case regular interval update is not running
} }
} }