From 4af360d629758a1fc32408ae8a0b1e7c9a269580 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Mon, 10 Mar 2014 23:58:05 +0000 Subject: [PATCH] HADOOP-10395. Merging r1575562 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576142 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../test/java/org/apache/hadoop/ipc/TestCallQueueManager.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f61e2ec15af..7e30937d734 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -110,6 +110,8 @@ Release 2.4.0 - UNRELEASED HADOOP-10393. Fix the javac warnings in hadoop-auth. (szetszwo) + HADOOP-10395. TestCallQueueManager is flaky. (Arpit Agarwal) + BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS HADOOP-10185. FileSystem API for ACLs. (cnauroth) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java index 3e519af8d2d..46435f4a675 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestCallQueueManager.java @@ -190,8 +190,6 @@ public class TestCallQueueManager { Thread.sleep(10); - assertTrue(manager.size() > 0); - for (int i=0; i < 5; i++) { manager.swapQueue(LinkedBlockingQueue.class, 5000, "", null); }