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 ma...@apache.org on 2012/02/19 23:36:08 UTC
svn commit: r1291080 - in /hadoop/common/branches/branch-1: CHANGES.txt
src/core/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
Author: mattf
Date: Sun Feb 19 22:36:08 2012
New Revision: 1291080
URL: http://svn.apache.org/viewvc?rev=1291080&view=rev
Log:
HADOOP-8050. Deadlock in metrics. Contributed by Kihwal Lee.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1291080&r1=1291079&r2=1291080&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Feb 19 22:36:08 2012
@@ -152,7 +152,7 @@ Release 1.1.0 - unreleased
HDFS-2741. Document the max transfer threads property for branch-1. Backport of HDFS-1866. (Markus Jelsma via harsh)
-Release 1.0.1 - 2012.02.12
+Release 1.0.1 - 2012.02.19
NEW FEATURES
@@ -198,6 +198,8 @@ Release 1.0.1 - 2012.02.12
HADOOP-8037. Binary tarball does not preserve platform info for native builds,
and RPMs fail to provide needed symlinks for libhadoop.so. (Matt Foley)
+ HADOOP-8050. Deadlock in metrics. (Kihwal Lee via mattf)
+
Release 1.0.0 - 2011.12.15
Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 19 22:36:08 2012
@@ -3,7 +3,7 @@
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1174370,1174917,1176042,1176248,1176638,1176645,1200050,1200078,1200199,1202378,1203419,1205530
-/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738,1214655,1214658,1214661,1214675,1238997,1242072,1243204,1243785,1244142
+/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738,1214655,1214658,1214661,1214675,1238997,1242072,1243204,1243785,1244142,1291078
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java?rev=1291080&r1=1291079&r2=1291080&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java (original)
+++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java Sun Feb 19 22:36:08 2012
@@ -92,17 +92,19 @@ class MetricsSourceAdapter implements Dy
}
@Override
- public synchronized Object getAttribute(String attribute)
+ public Object getAttribute(String attribute)
throws AttributeNotFoundException, MBeanException, ReflectionException {
updateJmxCache();
- Attribute a = attrCache.get(attribute);
- if (a == null) {
- throw new AttributeNotFoundException(attribute +" not found");
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug(attribute +": "+ a.getName() +"="+ a.getValue());
+ synchronized(this) {
+ Attribute a = attrCache.get(attribute);
+ if (a == null) {
+ throw new AttributeNotFoundException(attribute +" not found");
+ }
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(attribute +": "+ a.getName() +"="+ a.getValue());
+ }
+ return a.getValue();
}
- return a.getValue();
}
public void setAttribute(Attribute attribute)
@@ -112,17 +114,19 @@ class MetricsSourceAdapter implements Dy
}
@Override
- public synchronized AttributeList getAttributes(String[] attributes) {
+ public AttributeList getAttributes(String[] attributes) {
updateJmxCache();
- AttributeList ret = new AttributeList();
- for (String key : attributes) {
- Attribute attr = attrCache.get(key);
- if (LOG.isDebugEnabled()) {
- LOG.debug(key +": "+ attr.getName() +"="+ attr.getValue());
+ synchronized(this) {
+ AttributeList ret = new AttributeList();
+ for (String key : attributes) {
+ Attribute attr = attrCache.get(key);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(key +": "+ attr.getName() +"="+ attr.getValue());
+ }
+ ret.add(attr);
}
- ret.add(attr);
+ return ret;
}
- return ret;
}
@Override
@@ -137,17 +141,32 @@ class MetricsSourceAdapter implements Dy
}
@Override
- public synchronized MBeanInfo getMBeanInfo() {
+ public MBeanInfo getMBeanInfo() {
updateJmxCache();
return infoCache;
}
private void updateJmxCache() {
- if (System.currentTimeMillis() - jmxCacheTS >= jmxCacheTTL) {
- if (lastRecs == null) {
- MetricsBuilderImpl builder = new MetricsBuilderImpl();
- getMetrics(builder, true);
+ boolean getAllMetrics = false;
+ synchronized(this) {
+ if (System.currentTimeMillis() - jmxCacheTS >= jmxCacheTTL) {
+ // temporarilly advance the expiry while updating the cache
+ jmxCacheTS = System.currentTimeMillis() + jmxCacheTTL;
+ if (lastRecs == null) {
+ getAllMetrics = true;
+ }
+ }
+ else {
+ return;
}
+ }
+
+ if (getAllMetrics) {
+ MetricsBuilderImpl builder = new MetricsBuilderImpl();
+ getMetrics(builder, true);
+ }
+
+ synchronized(this) {
int cacheSize = attrCache.size(); // because updateAttrCache changes it!
int numMetrics = updateAttrCache();
if (cacheSize < numMetrics) {