From affe8082b7c1c301f4c911a3835e80946353ff39 Mon Sep 17 00:00:00 2001 From: Nishant Date: Fri, 13 May 2016 13:24:13 +0530 Subject: [PATCH 1/2] Allow user to set cost balancer threads more than the number of cores. Allow user to set cost balancer threads more than the number of cores. --- .../druid/server/coordinator/CoordinatorDynamicConfig.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/main/java/io/druid/server/coordinator/CoordinatorDynamicConfig.java b/server/src/main/java/io/druid/server/coordinator/CoordinatorDynamicConfig.java index 62f07d8474d5..f4eaa7a5e2b2 100644 --- a/server/src/main/java/io/druid/server/coordinator/CoordinatorDynamicConfig.java +++ b/server/src/main/java/io/druid/server/coordinator/CoordinatorDynamicConfig.java @@ -57,10 +57,7 @@ public CoordinatorDynamicConfig( this.replicantLifetime = replicantLifetime; this.replicationThrottleLimit = replicationThrottleLimit; this.emitBalancingStats = emitBalancingStats; - this.balancerComputeThreads = Math.min( - Math.max(balancerComputeThreads, 1), - Math.max(Runtime.getRuntime().availableProcessors() - 1, 1) - ); + this.balancerComputeThreads = Math.max(balancerComputeThreads, 1); this.killDataSourceWhitelist = killDataSourceWhitelist; } From 178f09f436b41d83ad7371cfab646a2046e31657 Mon Sep 17 00:00:00 2001 From: Nishant Date: Fri, 13 May 2016 13:29:10 +0530 Subject: [PATCH 2/2] modify test --- .../io/druid/server/http/CoordinatorDynamicConfigTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/io/druid/server/http/CoordinatorDynamicConfigTest.java b/server/src/test/java/io/druid/server/http/CoordinatorDynamicConfigTest.java index af5bb477eccf..c4536627e694 100644 --- a/server/src/test/java/io/druid/server/http/CoordinatorDynamicConfigTest.java +++ b/server/src/test/java/io/druid/server/http/CoordinatorDynamicConfigTest.java @@ -40,6 +40,7 @@ public void testSerde() throws Exception + " \"maxSegmentsToMove\": 1,\n" + " \"replicantLifetime\": 1,\n" + " \"replicationThrottleLimit\": 1,\n" + + " \"balancerComputeThreads\": 2, \n" + " \"emitBalancingStats\": true,\n" + " \"killDataSourceWhitelist\": [\"test\"]\n" + "}\n"; @@ -56,7 +57,7 @@ public void testSerde() throws Exception ); Assert.assertEquals( - new CoordinatorDynamicConfig(1, 1, 1, 1, 1, 1, 1, true, ImmutableSet.of("test")), + new CoordinatorDynamicConfig(1, 1, 1, 1, 1, 1, 2, true, ImmutableSet.of("test")), actual ); }