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 st...@apache.org on 2016/01/09 12:17:26 UTC
[1/2] hadoop git commit: HADOOP-12573. TestRPC.testClientBackOff
failing. (Xiao Chen via stevel)
Repository: hadoop
Updated Branches:
refs/heads/trunk f0fa6d869 -> d7ed04758
HADOOP-12573. TestRPC.testClientBackOff failing. (Xiao Chen via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84bf5122
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84bf5122
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84bf5122
Branch: refs/heads/trunk
Commit: 84bf5122e4e3166539ed4c678e564691f1365573
Parents: f0fa6d8
Author: Steve Loughran <st...@apache.org>
Authored: Thu Jan 7 16:18:25 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 9 11:14:47 2016 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/ipc/TestRPC.java | 21 ++++++++++++++++----
2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84bf5122/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index a5aebeb..1c86e9b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -671,6 +671,9 @@ Release 2.9.0 - UNRELEASED
"hadoop.security.keystore.JavaKeyStoreProvider.password"
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
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84bf5122/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
index 8fe3cf2..e19ef34 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
@@ -26,6 +26,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
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.InterruptedIOException;
@@ -67,6 +70,7 @@ import org.apache.hadoop.io.retry.RetryPolicy;
import org.apache.hadoop.io.retry.RetryProxy;
import org.apache.hadoop.ipc.Client.ConnectionId;
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.net.NetUtils;
import org.apache.hadoop.security.AccessControlException;
@@ -82,6 +86,8 @@ import org.apache.hadoop.test.MetricsAsserts;
import org.apache.hadoop.test.MockitoUtil;
import org.junit.Before;
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.EnumDescriptorProto;
@@ -1108,8 +1114,13 @@ public class TestRPC {
.setBindAddress(ADDRESS).setPort(0)
.setQueueSizePerHandler(1).setNumHandlers(1).setVerbose(true)
.build();
+ @SuppressWarnings("unchecked")
+ CallQueueManager<Call> spy = spy((CallQueueManager<Call>) Whitebox
+ .getInternalState(server, "callQueue"));
+ Whitebox.setInternalState(server, "callQueue", spy);
server.start();
+ Exception lastException = null;
final TestProtocol proxy =
RPC.getProxy(TestProtocol.class, TestProtocol.versionID,
NetUtils.getConnectAddress(server), conf);
@@ -1126,10 +1137,7 @@ public class TestRPC {
return null;
}
}));
- }
- while (server.getCallQueueLen() != 1
- && countThreads(CallQueueManager.class.getName()) != 1) {
- Thread.sleep(100);
+ verify(spy, timeout(500).times(i + 1)).offer(Mockito.<Call>anyObject());
}
try {
proxy.sleep(100);
@@ -1137,6 +1145,8 @@ public class TestRPC {
IOException unwrapExeption = e.unwrapRemoteException();
if (unwrapExeption instanceof RetriableException) {
succeeded = true;
+ } else {
+ lastException = unwrapExeption;
}
}
} finally {
@@ -1144,6 +1154,9 @@ public class TestRPC {
RPC.stopProxy(proxy);
executorService.shutdown();
}
+ if (lastException != null) {
+ LOG.error("Last received non-RetriableException:", lastException);
+ }
assertTrue("RetriableException not received", succeeded);
}
[2/2] hadoop git commit: HADOOP-12590. TestCompressorDecompressor
failing without stack traces (John Zhuge via stevel)
Posted by st...@apache.org.
HADOOP-12590. TestCompressorDecompressor failing without stack traces (John Zhuge via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d7ed0475
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d7ed0475
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d7ed0475
Branch: refs/heads/trunk
Commit: d7ed04758c1bdb1c7caf5cf3a03da3ad81701957
Parents: 84bf512
Author: Steve Loughran <st...@apache.org>
Authored: Sat Jan 9 11:10:20 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 9 11:15:07 2016 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../apache/hadoop/io/compress/TestCompressorDecompressor.java | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7ed0475/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 1c86e9b..0bc8ae5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -674,6 +674,9 @@ Release 2.9.0 - UNRELEASED
HADOOP-12573. TestRPC.testClientBackOff failing.
(Xiao Chen via stevel)
+ HADOOP-12590. TestCompressorDecompressor failing without stack traces
+ (John Zhuge via stevel)
+
Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7ed0475/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
index a8ac993..49a41fb 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.io.compress.snappy.SnappyCompressor;
import org.apache.hadoop.io.compress.snappy.SnappyDecompressor;
import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater;
import org.apache.hadoop.io.compress.zlib.BuiltInZlibInflater;
+import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
@@ -66,7 +67,8 @@ public class TestCompressorDecompressor {
.test();
} catch (Exception ex) {
- fail("testCompressorDecompressor error !!!" + ex);
+ GenericTestUtils.assertExceptionContains(
+ "testCompressorDecompressor error !!!", ex);
}
}
@@ -88,7 +90,8 @@ public class TestCompressorDecompressor {
.test();
} catch (Exception ex) {
- fail("testCompressorDecompressorWithExeedBufferLimit error !!!" + ex);
+ GenericTestUtils.assertExceptionContains(
+ "testCompressorDecompressorWithExeedBufferLimit error !!!", ex);
}
}