From 6f83e9c51e92c1eda3ee4887a785cb99ad692e67 Mon Sep 17 00:00:00 2001 From: Xiaoyu Yao Date: Fri, 4 Aug 2017 11:33:10 -0700 Subject: [PATCH] HDFS-12163. Ozone: Reduce MiniOzoneCluster handler thread count. Contributed by Weiwei Yang. --- .../apache/hadoop/ozone/MiniOzoneCluster.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java index f2a8be48357..b71493d6c8b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java @@ -293,6 +293,9 @@ public final class MiniOzoneCluster extends MiniDFSCluster private Boolean ozoneEnabled = true; private Boolean waitForChillModeFinish = true; private Boolean randomContainerPort = true; + // Use relative smaller number of handlers for testing + private int numOfKsmHandlers = 20; + private int numOfScmHandlers = 20; /** * Creates a new Builder. @@ -361,6 +364,16 @@ public final class MiniOzoneCluster extends MiniDFSCluster return this; } + public Builder setNumOfKSMHandlers(int numOfHandlers) { + numOfKsmHandlers = numOfHandlers; + return this; + } + + public Builder setNumOfSCMHandlers(int numOfHandlers) { + numOfScmHandlers = numOfHandlers; + return this; + } + public String getPath() { return path; } @@ -385,6 +398,10 @@ public final class MiniOzoneCluster extends MiniDFSCluster conf.set(KSMConfigKeys.OZONE_KSM_ADDRESS_KEY, "127.0.0.1:0"); conf.set(KSMConfigKeys.OZONE_KSM_HTTP_ADDRESS_KEY, "127.0.0.1:0"); + // Configure KSM and SCM handlers + conf.setInt(ScmConfigKeys.OZONE_SCM_HANDLER_COUNT_KEY, numOfScmHandlers); + conf.setInt(KSMConfigKeys.OZONE_KSM_HANDLER_COUNT_KEY, numOfKsmHandlers); + // Use random ports for ozone containers in mini cluster, // in order to launch multiple container servers per node. conf.setBoolean(OzoneConfigKeys.DFS_CONTAINER_IPC_RANDOM_PORT,