Repository: hadoop Updated Branches: refs/heads/branch-2 22f250147 -> ac7d85efb
HADOOP-12440. TestRPC#testRPCServerShutdown did not produce the desired thread states before shutting down. (Xiao Chen via mingma) (cherry picked from commit 5c3b663bf95551d1cf36a2a39849e0676893fa1d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ac7d85ef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ac7d85ef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ac7d85ef Branch: refs/heads/branch-2 Commit: ac7d85efb2fdf14542a0840c939a308618cc8985 Parents: 22f2501 Author: Ming Ma <[email protected]> Authored: Mon Sep 28 18:12:51 2015 -0700 Committer: Ming Ma <[email protected]> Committed: Mon Sep 28 18:14:29 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/ipc/TestRPC.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac7d85ef/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 51a23b8..2c0f708 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -590,6 +590,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11918. Listing an empty s3a root directory throws FileNotFound. (Lei (Eddy) Xu via cnauroth) + HADOOP-12440. TestRPC#testRPCServerShutdown did not produce the desired + thread states before shutting down. (Xiao Chen via mingma) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() http://git-wip-us.apache.org/repos/asf/hadoop/blob/ac7d85ef/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 f85e6a6..75f4695 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 @@ -1056,8 +1056,8 @@ public class TestRPC { })); } while (server.getCallQueueLen() != 1 - && countThreads(CallQueueManager.class.getName()) != 1 - && countThreads(TestProtocol.class.getName()) != 1) { + || countThreads(CallQueueManager.class.getName()) != 1 + || countThreads(TestImpl.class.getName()) != 1) { Thread.sleep(100); } } finally {
