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

HADOOP-12573. TestRPC.testClientBackOff failing. (Xiao Chen via stevel)

This commit is contained in:
Steve Loughran 2016-01-07 16:18:25 +00:00
parent f0fa6d869b
commit 84bf5122e4
2 changed files with 20 additions and 4 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

@ -671,6 +671,9 @@ Release 2.9.0 - UNRELEASED
"hadoop.security.keystore.JavaKeyStoreProvider.password" "hadoop.security.keystore.JavaKeyStoreProvider.password"
should be updated with new name. (Surendra Singh Lilhore via stevel) should be updated with new name. (Surendra Singh Lilhore via stevel)
HADOOP-12573. TestRPC.testClientBackOff failing.
(Xiao Chen via stevel)
Release 2.8.0 - UNRELEASED Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -26,6 +26,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import java.io.Closeable; import java.io.Closeable;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
@ -67,6 +70,7 @@ import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.io.retry.RetryProxy; import org.apache.hadoop.io.retry.RetryProxy;
import org.apache.hadoop.ipc.Client.ConnectionId; import org.apache.hadoop.ipc.Client.ConnectionId;
import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto.RpcErrorCodeProto; import org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto.RpcErrorCodeProto;
import org.apache.hadoop.ipc.Server.Call;
import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.MetricsRecordBuilder;
import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.AccessControlException;
@ -82,6 +86,8 @@ import org.apache.hadoop.test.MetricsAsserts;
import org.apache.hadoop.test.MockitoUtil; import org.apache.hadoop.test.MockitoUtil;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.internal.util.reflection.Whitebox;
import com.google.protobuf.DescriptorProtos; import com.google.protobuf.DescriptorProtos;
import com.google.protobuf.DescriptorProtos.EnumDescriptorProto; import com.google.protobuf.DescriptorProtos.EnumDescriptorProto;
@ -1108,8 +1114,13 @@ public class TestRPC {
.setBindAddress(ADDRESS).setPort(0) .setBindAddress(ADDRESS).setPort(0)
.setQueueSizePerHandler(1).setNumHandlers(1).setVerbose(true) .setQueueSizePerHandler(1).setNumHandlers(1).setVerbose(true)
.build(); .build();
@SuppressWarnings("unchecked")
CallQueueManager<Call> spy = spy((CallQueueManager<Call>) Whitebox
.getInternalState(server, "callQueue"));
Whitebox.setInternalState(server, "callQueue", spy);
server.start(); server.start();
Exception lastException = null;
final TestProtocol proxy = final TestProtocol proxy =
RPC.getProxy(TestProtocol.class, TestProtocol.versionID, RPC.getProxy(TestProtocol.class, TestProtocol.versionID,
NetUtils.getConnectAddress(server), conf); NetUtils.getConnectAddress(server), conf);
@ -1126,10 +1137,7 @@ public class TestRPC {
return null; return null;
} }
})); }));
} verify(spy, timeout(500).times(i + 1)).offer(Mockito.<Call>anyObject());
while (server.getCallQueueLen() != 1
&& countThreads(CallQueueManager.class.getName()) != 1) {
Thread.sleep(100);
} }
try { try {
proxy.sleep(100); proxy.sleep(100);
@ -1137,6 +1145,8 @@ public class TestRPC {
IOException unwrapExeption = e.unwrapRemoteException(); IOException unwrapExeption = e.unwrapRemoteException();
if (unwrapExeption instanceof RetriableException) { if (unwrapExeption instanceof RetriableException) {
succeeded = true; succeeded = true;
} else {
lastException = unwrapExeption;
} }
} }
} finally { } finally {
@ -1144,6 +1154,9 @@ public class TestRPC {
RPC.stopProxy(proxy); RPC.stopProxy(proxy);
executorService.shutdown(); executorService.shutdown();
} }
if (lastException != null) {
LOG.error("Last received non-RetriableException:", lastException);
}
assertTrue("RetriableException not received", succeeded); assertTrue("RetriableException not received", succeeded);
} }