From ca17ddac07204ea092068f5e78790b6a31e9a30f Mon Sep 17 00:00:00 2001 From: Zhongyi Xie Date: Tue, 8 Sep 2015 16:38:21 -0700 Subject: [PATCH] [TACHYON-865] address reviewers' comments --- .../java/tachyon/client/block/BlockMasterClientPool.java | 5 +++-- .../main/java/tachyon/client/block/BlockStoreContext.java | 2 +- .../java/tachyon/client/block/BlockWorkerClientPool.java | 7 ++++--- common/src/main/java/tachyon/Constants.java | 6 +++--- common/src/main/resources/tachyon-default.properties | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/clients/unshaded/src/main/java/tachyon/client/block/BlockMasterClientPool.java b/clients/unshaded/src/main/java/tachyon/client/block/BlockMasterClientPool.java index d78d26c24137..f4fdb038ea6b 100644 --- a/clients/unshaded/src/main/java/tachyon/client/block/BlockMasterClientPool.java +++ b/clients/unshaded/src/main/java/tachyon/client/block/BlockMasterClientPool.java @@ -34,6 +34,7 @@ public final class BlockMasterClientPool extends ResourcePool { private final ExecutorService mExecutorService; private final InetSocketAddress mMasterAddress; + private final int mMaxCapacity; /** * Creates a new block master client pool. @@ -42,9 +43,9 @@ public final class BlockMasterClientPool extends ResourcePool */ public BlockMasterClientPool(InetSocketAddress masterAddress) { super(ClientContext.getConf().getInt(Constants.USER_BLOCK_MASTER_CLIENT_THREADS)); - int capacity = ClientContext.getConf().getInt(Constants.USER_BLOCK_MASTER_CLIENT_THREADS); + mMaxCapacity = ClientContext.getConf().getInt(Constants.USER_BLOCK_MASTER_CLIENT_THREADS); mExecutorService = - Executors.newFixedThreadPool(capacity, + Executors.newFixedThreadPool(mMaxCapacity, ThreadFactoryUtils.build("block-master-heartbeat-%d", true)); mMasterAddress = masterAddress; } diff --git a/clients/unshaded/src/main/java/tachyon/client/block/BlockStoreContext.java b/clients/unshaded/src/main/java/tachyon/client/block/BlockStoreContext.java index 702659106ffe..255ed72e4293 100644 --- a/clients/unshaded/src/main/java/tachyon/client/block/BlockStoreContext.java +++ b/clients/unshaded/src/main/java/tachyon/client/block/BlockStoreContext.java @@ -49,7 +49,7 @@ public enum BlockStoreContext { */ BlockStoreContext() { mBlockMasterClientPool = new BlockMasterClientPool(ClientContext.getMasterAddress()); - final int CAPACITY = ClientContext.getConf().getInt(Constants.USER_REMOTE_WORKER_THREADS); + final int CAPACITY = ClientContext.getConf().getInt(Constants.USER_REMOTE_BLOCK_WORKER_THREADS); mRemoteBlockWorkerExecutor = Executors.newFixedThreadPool(CAPACITY, ThreadFactoryUtils.build("remote-block-worker-heartbeat-%d", true)); diff --git a/clients/unshaded/src/main/java/tachyon/client/block/BlockWorkerClientPool.java b/clients/unshaded/src/main/java/tachyon/client/block/BlockWorkerClientPool.java index b775996407e9..6994af4d12b7 100644 --- a/clients/unshaded/src/main/java/tachyon/client/block/BlockWorkerClientPool.java +++ b/clients/unshaded/src/main/java/tachyon/client/block/BlockWorkerClientPool.java @@ -40,6 +40,7 @@ public final class BlockWorkerClientPool extends ResourcePool { */ private final ExecutorService mExecutorService; private final NetAddress mWorkerNetAddress; + private final int mMaxCapacity; /** * Creates a new block worker client pool. @@ -47,9 +48,9 @@ public final class BlockWorkerClientPool extends ResourcePool { * @param workerAddress the worker address */ public BlockWorkerClientPool(NetAddress workerAddress) { - super(ClientContext.getConf().getInt(Constants.USER_BLOCK_WORKER_CLIENT_THREADS)); - int capacity = ClientContext.getConf().getInt(Constants.USER_BLOCK_WORKER_CLIENT_THREADS); - mExecutorService = Executors.newFixedThreadPool(capacity, ThreadFactoryUtils.build( + super(ClientContext.getConf().getInt(Constants.USER_LOCAL_BLOCK_WORKER_CLIENT_THREADS)); + mMaxCapacity = ClientContext.getConf().getInt(Constants.USER_LOCAL_BLOCK_WORKER_CLIENT_THREADS); + mExecutorService = Executors.newFixedThreadPool(mMaxCapacity, ThreadFactoryUtils.build( "block-worker-heartbeat-%d", true)); mWorkerNetAddress = workerAddress; } diff --git a/common/src/main/java/tachyon/Constants.java b/common/src/main/java/tachyon/Constants.java index 78cca09c5524..2b00fc31cea8 100644 --- a/common/src/main/java/tachyon/Constants.java +++ b/common/src/main/java/tachyon/Constants.java @@ -250,10 +250,10 @@ public final class Constants { public static final String USER_REMOTE_BLOCK_WRITER = "tachyon.user.remote.block.writer.class"; public static final String USER_ENABLE_LOCAL_READ = "tachyon.user.localread.enable"; public static final String USER_ENABLE_LOCAL_WRITE = "tachyon.user.localwrite.enable"; - public static final String USER_REMOTE_WORKER_THREADS = + public static final String USER_REMOTE_BLOCK_WORKER_THREADS = "tachyon.user.remote.block.worker.threads"; - public static final String USER_BLOCK_WORKER_CLIENT_THREADS = - "tachyon.user.block.worker.client.threads"; + public static final String USER_LOCAL_BLOCK_WORKER_CLIENT_THREADS = + "tachyon.user.local.block.worker.client.threads"; public static final String USER_BLOCK_MASTER_CLIENT_THREADS = "tachyon.user.block.master.client.threads"; diff --git a/common/src/main/resources/tachyon-default.properties b/common/src/main/resources/tachyon-default.properties index fde658339ebd..0b9e8f32ce2c 100644 --- a/common/src/main/resources/tachyon-default.properties +++ b/common/src/main/resources/tachyon-default.properties @@ -112,5 +112,5 @@ tachyon.user.localwrite.enable=true tachyon.user.network.netty.worker.threads=0 tachyon.user.network.netty.timeout.ms=3000 tachyon.user.remote.block.worker.threads=10 -tachyon.user.block.worker.client.threads=10000 +tachyon.user.local.block.worker.client.threads=10000 tachyon.user.block.master.client.threads=10