Repository: hadoop Updated Branches: refs/heads/branch-2.6 fbbd1571e -> 02b5091a1
HADOOP-13189. FairCallQueue makes callQueue larger than the configured capacity. Contributed by Vinitha Gankidi. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/02b5091a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/02b5091a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/02b5091a Branch: refs/heads/branch-2.6 Commit: 02b5091a1427f9abcc1c8435ab6b809e006b8f6e Parents: fbbd157 Author: Konstantin V Shvachko <s...@apache.org> Authored: Thu Jun 16 19:09:21 2016 -0700 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Thu Jun 16 19:13:53 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/ipc/CallQueueManager.java | 3 ++- .../org/apache/hadoop/ipc/FairCallQueue.java | 19 +++++++++++++------ .../org/apache/hadoop/ipc/TestFairCallQueue.java | 8 +------- 3 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/02b5091a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java index 27949d0..e4459c2 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallQueueManager.java @@ -50,7 +50,8 @@ public class CallQueueManager<E> { maxQueueSize, namespace, conf); this.putRef = new AtomicReference<BlockingQueue<E>>(bq); this.takeRef = new AtomicReference<BlockingQueue<E>>(bq); - LOG.info("Using callQueue " + backingClass); + LOG.info("Using callQueue: " + backingClass + " queueCapacity: " + + maxQueueSize); } private <T extends BlockingQueue<E>> T createCallQueueInstance( http://git-wip-us.apache.org/repos/asf/hadoop/blob/02b5091a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java index 0b56243..6a6701a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/FairCallQueue.java @@ -77,21 +77,28 @@ public class FairCallQueue<E extends Schedulable> extends AbstractQueue<E> /** * Create a FairCallQueue. - * @param capacity the maximum size of each sub-queue + * @param capacity the total size of all sub-queues * @param ns the prefix to use for configuration * @param conf the configuration to read from - * Notes: the FairCallQueue has no fixed capacity. Rather, it has a minimum - * capacity of `capacity` and a maximum capacity of `capacity * number_queues` + * Notes: Each sub-queue has a capacity of `capacity / numSubqueues`. + * The first or the highest priority sub-queue has an excess capacity + * of `capacity % numSubqueues` */ public FairCallQueue(int capacity, String ns, Configuration conf) { int numQueues = parseNumQueues(ns, conf); - LOG.info("FairCallQueue is in use with " + numQueues + " queues."); + LOG.info("FairCallQueue is in use with " + numQueues + + " queues with total capacity of " + capacity); this.queues = new ArrayList<BlockingQueue<E>>(numQueues); this.overflowedCalls = new ArrayList<AtomicLong>(numQueues); - + int queueCapacity = capacity / numQueues; + int capacityForFirstQueue = queueCapacity + (capacity % numQueues); for(int i=0; i < numQueues; i++) { - this.queues.add(new LinkedBlockingQueue<E>(capacity)); + if (i == 0) { + this.queues.add(new LinkedBlockingQueue<E>(capacityForFirstQueue)); + } else { + this.queues.add(new LinkedBlockingQueue<E>(queueCapacity)); + } this.overflowedCalls.add(new AtomicLong(0)); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/02b5091a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestFairCallQueue.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestFairCallQueue.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestFairCallQueue.java index 2694ba3..bc1b588 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestFairCallQueue.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestFairCallQueue.java @@ -18,12 +18,6 @@ package org.apache.hadoop.ipc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -64,7 +58,7 @@ public class TestFairCallQueue extends TestCase { Configuration conf = new Configuration(); conf.setInt("ns." + IPC_CALLQUEUE_PRIORITY_LEVELS_KEY, 2); - fcq = new FairCallQueue<Schedulable>(5, "ns", conf); + fcq = new FairCallQueue<Schedulable>(10, "ns", conf); } // --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
