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 2013/07/04 05:20:38 UTC
svn commit: r1499631 - in
/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common:
./ CHANGES.txt src/main/java/
src/test/java/org/apache/hadoop/ipc/TestRPC.java
Author: szetszwo
Date: Thu Jul 4 03:20:38 2013
New Revision: 1499631
URL: http://svn.apache.org/r1499631
Log:
svn merge -c 1498787 from branch-2 for HADOOP-9678. TestRPC#testStopsAllThreads intermittently fails on Windows.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1498787
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1499631&r1=1499630&r2=1499631&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jul 4 03:20:38 2013
@@ -475,6 +475,9 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-9264. Port change to use Java untar API on Windows from
branch-1-win to trunk. (Chris Nauroth via suresh)
+ HADOOP-9678. TestRPC#testStopsAllThreads intermittently fails on Windows.
+ (Ivan Mitic via cnauroth)
+
HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather
than throw EOF at end of file. (Zhijie Shen via acmurthy)
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1498787
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java:r1498787
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java?rev=1499631&r1=1499630&r2=1499631&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java Thu Jul 4 03:20:38 2013
@@ -781,7 +781,17 @@ public class TestRPC {
.setNumHandlers(5).setVerbose(true).build();
server.start();
try {
- int threadsRunning = countThreads("Server$Listener$Reader");
+ // Wait for at least one reader thread to start
+ int threadsRunning = 0;
+ long totalSleepTime = 0;
+ do {
+ totalSleepTime += 10;
+ Thread.sleep(10);
+ threadsRunning = countThreads("Server$Listener$Reader");
+ } while (threadsRunning == 0 && totalSleepTime < 5000);
+
+ // Validate that at least one thread started (we didn't timeout)
+ threadsRunning = countThreads("Server$Listener$Reader");
assertTrue(threadsRunning > 0);
} finally {
server.stop();