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

HADOOP-12418. TestRPC.testRPCInterruptedSimple fails intermittently. Contributed Kihwal Lee. 

Cherry-picked from 01b103f4ff
This commit is contained in:
Kihwal Lee 2015-10-20 15:08:16 -05:00 committed by Eric Payne
parent 32a86f199c
commit a9479f8f2c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -31,6 +31,9 @@ Release 2.7.4 - UNRELEASED
HADOOP-10980. TestActiveStandbyElector fails occasionally in trunk
(Eric Badger via jlowe)
HADOOP-12418. TestRPC.testRPCInterruptedSimple fails intermittently.
(kihwal)
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
@ -178,8 +181,6 @@ Release 2.7.3 - UNRELEASED
HADOOP-13312. Updated CHANGES.txt to reflect all the changes in branch-2.7.
(Akira Ajisaka via vinodkv)
Release 2.7.2 - 2016-01-25
INCOMPATIBLE CHANGES
NEW FEATURES

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

@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.Closeable;
import java.io.InterruptedIOException;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
@ -881,11 +882,13 @@ public class TestRPC {
proxy.ping();
fail("Interruption did not cause IPC to fail");
} catch (IOException ioe) {
if (!ioe.toString().contains("InterruptedException")) {
throw ioe;
if (ioe.toString().contains("InterruptedException") ||
ioe instanceof InterruptedIOException) {
// clear interrupt status for future tests
Thread.interrupted();
return;
}
// clear interrupt status for future tests
Thread.interrupted();
throw ioe;
} finally {
server.stop();
}