GEODE-8780: Increase the default number of function execution threads. (#5837)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/OperationExecutors.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/OperationExecutors.java
index c4bc0c8..6e22704 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/OperationExecutors.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/OperationExecutors.java
@@ -29,7 +29,7 @@
Integer.getInteger("DistributionManager.MAX_THREADS", 100);
int MAX_FE_THREADS = Integer.getInteger("DistributionManager.MAX_FE_THREADS",
- Math.max(Runtime.getRuntime().availableProcessors() * 4, 16));
+ Math.max(Runtime.getRuntime().availableProcessors() * 16, 100));
/**
* @see PooledDistributionMessage
*/
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/properties.html b/geode-core/src/main/java/org/apache/geode/internal/cache/properties.html
index 0419553..445674a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/properties.html
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/properties.html
@@ -371,7 +371,7 @@
<dd>
<em>Public:</em> false
<p>
-<em>Integer:</em> (default is 16)
+<em>Integer:</em> (default is 100)
<p>
Maximum function execution threads.
<p>
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterOperationExecutorsTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterOperationExecutorsTest.java
new file mode 100644
index 0000000..c3f5cdf
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterOperationExecutorsTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.distributed.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ClusterOperationExecutorsTest {
+ private DistributionStats stats;
+ private InternalDistributedSystem system;
+ private DistributionConfig config;
+
+ @Before
+ public void setup() {
+ stats = mock(DistributionStats.class);
+ system = mock(InternalDistributedSystem.class);
+ config = mock(DistributionConfig.class);
+ when(system.getConfig()).thenReturn(config);
+ }
+
+ @Test
+ public void numOfFEThreadsIsAtLeast100() {
+ int minNumberOfFunctionExecutionThreads = 100;
+
+ ClusterOperationExecutors executors = new ClusterOperationExecutors(stats, system);
+
+ assertThat(executors.MAX_FE_THREADS)
+ .isGreaterThanOrEqualTo(minNumberOfFunctionExecutionThreads);
+ }
+
+ @Test
+ public void numOfFEThreadsCanBeSet() {
+ int numberOfFunctionExecutionThreads = 400;
+ String functionExecutionThreadsPropertyName = "DistributionManager.MAX_FE_THREADS";
+ System.setProperty(functionExecutionThreadsPropertyName,
+ Integer.toString(numberOfFunctionExecutionThreads));
+
+ try {
+ ClusterOperationExecutors executors = new ClusterOperationExecutors(stats, system);
+
+ assertThat(executors.MAX_FE_THREADS).isEqualTo(numberOfFunctionExecutionThreads);
+ } finally {
+ System.clearProperty(functionExecutionThreadsPropertyName);
+ }
+ }
+}
