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 ep...@apache.org on 2017/01/04 18:11:35 UTC
hadoop git commit: HADOOP-12605. Fix intermittent failure of
TestIPC.testIpcWithReaderQueuing (iwasakims)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 7aa95bcdd -> a631247c2
HADOOP-12605. Fix intermittent failure of TestIPC.testIpcWithReaderQueuing (iwasakims)
(cherry picked from commit 9eec6cbedcc53e6dd306a4a578a22937ae239260)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a631247c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a631247c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a631247c
Branch: refs/heads/branch-2.8
Commit: a631247c2a10c9c789f4bba635f3a4243230ceaa
Parents: 7aa95bc
Author: Masatake Iwasaki <iw...@apache.org>
Authored: Wed Jan 20 05:00:02 2016 +0900
Committer: Eric Payne <ep...@apache.org>
Committed: Wed Jan 4 18:04:43 2017 +0000
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/ipc/TestIPC.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a631247c/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
index 4ff0cf0..6fb3511 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
@@ -27,6 +27,8 @@ import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
@@ -72,6 +74,7 @@ import org.apache.hadoop.io.retry.RetryPolicies;
import org.apache.hadoop.io.retry.RetryProxy;
import org.apache.hadoop.ipc.Client.ConnectionId;
import org.apache.hadoop.ipc.RPC.RpcKind;
+import org.apache.hadoop.ipc.Server.Call;
import org.apache.hadoop.ipc.Server.Connection;
import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto;
import org.apache.hadoop.net.ConnectTimeoutException;
@@ -88,6 +91,7 @@ import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import org.mockito.internal.util.reflection.Whitebox;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -742,6 +746,7 @@ public class TestIPC {
// goal is to jam a handler with a connection, fill the callq with
// connections, in turn jamming the readers - then flood the server and
// ensure that the listener blocks when the reader connection queues fill
+ @SuppressWarnings("unchecked")
private void checkBlocking(int readers, int readerQ, int callQ) throws Exception {
int handlers = 1; // makes it easier
@@ -761,6 +766,9 @@ public class TestIPC {
// start server
final TestServerQueue server =
new TestServerQueue(clients, readers, callQ, handlers, conf);
+ CallQueueManager<Call> spy = spy(
+ (CallQueueManager<Call>)Whitebox.getInternalState(server, "callQueue"));
+ Whitebox.setInternalState(server, "callQueue", spy);
final InetSocketAddress addr = NetUtils.getConnectAddress(server);
server.start();
@@ -796,12 +804,10 @@ public class TestIPC {
if (i==0) {
// let first reader block in a call
server.firstCallLatch.await();
- } else if (i <= callQ) {
- // let subsequent readers jam the callq, will happen immediately
- while (server.getCallQueueLen() != i) {
- Thread.sleep(1);
- }
- } // additional threads block the readers trying to add to the callq
+ }
+ // wait until reader put a call to callQueue, to make sure all readers
+ // are blocking on the queue after initialClients threads are started.
+ verify(spy, timeout(100).times(i + 1)).put(Mockito.<Call>anyObject());
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org