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 om...@apache.org on 2011/06/17 00:03:28 UTC
svn commit: r1136703 - in /hadoop/common/branches/branch-0.20-security-204:
CHANGES.txt
src/test/org/apache/hadoop/util/TestQueueProcessingStatistics.java
Author: omalley
Date: Thu Jun 16 22:03:28 2011
New Revision: 1136703
URL: http://svn.apache.org/viewvc?rev=1136703&view=rev
Log:
HDFS-2044. TestQueueProcessingStatistics failing automatic test due to
timing issues. (mattf)
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/util/TestQueueProcessingStatistics.java
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1136703&r1=1136702&r2=1136703&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 16 22:03:28 2011
@@ -11,6 +11,9 @@ Release 0.20.204.0 - unreleased
BUG FIXES
+ HDFS-2044. TestQueueProcessingStatistics failing automatic test due to
+ timing issues. (mattf)
+
MAPREDUCE-2558. Add queue-level metrics 0.20-security branch - test fix
(jeffrey nasbit via mahadev)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 22:03:28 2011
@@ -1,7 +1,7 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1134140
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
-/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1133274,1133282
+/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1133133,1133274,1133282
/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-0.20-security-204/src/test/org/apache/hadoop/util/TestQueueProcessingStatistics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/util/TestQueueProcessingStatistics.java?rev=1136703&r1=1136702&r2=1136703&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/util/TestQueueProcessingStatistics.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/util/TestQueueProcessingStatistics.java Thu Jun 16 22:03:28 2011
@@ -89,6 +89,13 @@ public class TestQueueProcessingStatisti
//Asserts based on general principles
assertTrue(failMsg(), qStats.startTime >= 0);
if (qStats.state != State.BEGIN_COLLECTING) {
+ /* The following timing calculations don't work in many
+ * automated test environments (e.g., on heavily loaded servers with
+ * very unreliable "sleep()" durations), but are useful during
+ * development work. Commenting them out but leaving them here
+ * for dev use.
+ */
+ /*
assertAlmostEquals(failMsg() + " inCycle=" + inCycle,
qStats.startTimeCurrentCycle,
qStats.startTime
@@ -100,6 +107,7 @@ public class TestQueueProcessingStatisti
qStats.clockDuration,
qStats.processDuration
+ cycleDelay * (qStats.cycleCount - (qStats.cycleCount > 0 ? 1 : 0)));
+ */
}
assertTrue(failMsg(), qStats.workItemCount >= 0);
assertTrue(failMsg(), qStats.cycleCount >= 0);