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 sz...@apache.org on 2014/04/09 18:50:26 UTC
svn commit: r1586031 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./
CHANGES.txt src/
src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Author: szetszwo
Date: Wed Apr 9 16:50:25 2014
New Revision: 1586031
URL: http://svn.apache.org/r1586031
Log:
svn merge -c 1586030 from trunk for HADOOP-10473. TestCallQueueManager should interrupt before counting calls.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1586030
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1586031&r1=1586030&r2=1586031&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Apr 9 16:50:25 2014
@@ -73,6 +73,9 @@ Release 2.4.1 - UNRELEASED
HADOOP-10456. Bug in Configuration.java exposed by Spark
(ConcurrentModificationException). (Nishkam Ravi via cnauroth)
+ HADOOP-10473. TestCallQueueManager should interrupt before counting calls.
+ (szetszwo)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1586030
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1586030
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java?rev=1586031&r1=1586030&r2=1586031&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java Wed Apr 9 16:50:25 2014
@@ -19,7 +19,6 @@
package org.apache.hadoop.ipc;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.HashMap;
@@ -49,7 +48,7 @@ public class TestCallQueueManager {
public volatile int callsAdded = 0; // How many calls we added, accurate unless interrupted
private final int maxCalls;
- private boolean isRunning = true;
+ private volatile boolean isRunning = true;
public Putter(CallQueueManager<FakeCall> aCq, int maxCalls, int tag) {
this.maxCalls = maxCalls;
@@ -201,16 +200,22 @@ public class TestCallQueueManager {
// Ensure no calls were dropped
long totalCallsCreated = 0;
- long totalCallsConsumed = 0;
-
for (Putter p : producers) {
- totalCallsCreated += p.callsAdded;
threads.get(p).interrupt();
}
+ for (Putter p : producers) {
+ threads.get(p).join();
+ totalCallsCreated += p.callsAdded;
+ }
+
+ long totalCallsConsumed = 0;
for (Taker t : consumers) {
- totalCallsConsumed += t.callsTaken;
threads.get(t).interrupt();
}
+ for (Taker t : consumers) {
+ threads.get(t).join();
+ totalCallsConsumed += t.callsTaken;
+ }
assertEquals(totalCallsConsumed, totalCallsCreated);
}