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

HADOOP-9678. Merging change r1498786 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498787 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-07-02 05:38:22 +00:00
parent dd25abb825
commit 2f0d853fd6
2 changed files with 14 additions and 1 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

@ -515,6 +515,9 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-9264. Port change to use Java untar API on Windows from HADOOP-9264. Port change to use Java untar API on Windows from
branch-1-win to trunk. (Chris Nauroth via suresh) 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 HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather
than throw EOF at end of file. (Zhijie Shen via acmurthy) than throw EOF at end of file. (Zhijie Shen via acmurthy)

12
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
View File

@ -781,7 +781,17 @@ public class TestRPC {
.setNumHandlers(5).setVerbose(true).build(); .setNumHandlers(5).setVerbose(true).build();
server.start(); server.start();
try { 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); assertTrue(threadsRunning > 0);
} finally { } finally {
server.stop(); server.stop();