[FLINK-33532][rpc] Support configured akka remote dispatcher thread p…

…ool size
apache · Nov 16, 2023 · 8ef71ba · 8ef71ba
1 parent 012704d
commit 8ef71ba
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 0 deletions.
diff --git a/docs/layouts/shortcodes/generated/akka_configuration.html b/docs/layouts/shortcodes/generated/akka_configuration.html
@@ -56,6 +56,24 @@
             <td>Integer</td>
             <td>Min number of threads to cap factor-based parallelism number to.</td>
         </tr>
+        <tr>
+            <td><h5>pekko.remote-fork-join-executor.parallelism-factor</h5></td>
+            <td style="word-wrap: break-word;">2.0</td>
+            <td>Double</td>
+            <td>The parallelism factor is used to determine thread pool size using the following formula: ceil(available processors * factor). Resulting size is then bounded by the parallelism-min and parallelism-max values.</td>
+        </tr>
+        <tr>
+            <td><h5>pekko.remote-fork-join-executor.parallelism-max</h5></td>
+            <td style="word-wrap: break-word;">16</td>
+            <td>Integer</td>
+            <td>Max number of threads to cap factor-based parallelism number to.</td>
+        </tr>
+        <tr>
+            <td><h5>pekko.remote-fork-join-executor.parallelism-min</h5></td>
+            <td style="word-wrap: break-word;">8</td>
+            <td>Integer</td>
+            <td>Min number of threads to cap factor-based parallelism number to.</td>
+        </tr>
         <tr>
             <td><h5>pekko.framesize</h5></td>
             <td style="word-wrap: break-word;">"10485760b"</td>

diff --git a/flink-core/src/main/java/org/apache/flink/configuration/AkkaOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/AkkaOptions.java
@@ -237,6 +237,38 @@ public static boolean isForceRpcInvocationSerializationEnabled(Configuration con
                                             "Max number of threads to cap factor-based parallelism number to.")
                                     .build());
 
+    public static final ConfigOption<Double> REMOTE_FORK_JOIN_EXECUTOR_PARALLELISM_FACTOR =
+            ConfigOptions.key("pekko.remote-fork-join-executor.parallelism-factor")
+                    .doubleType()
+                    .defaultValue(2.0)
+                    .withDescription(
+                            Description.builder()
+                                    .text(
+                                            "The parallelism factor is used to determine thread pool size using the"
+                                                    + " following formula: ceil(available processors * factor). Resulting size"
+                                                    + " is then bounded by the parallelism-min and parallelism-max values.")
+                                    .build());
+
+    public static final ConfigOption<Integer> REMOTE_FORK_JOIN_EXECUTOR_PARALLELISM_MIN =
+            ConfigOptions.key("pekko.remote-fork-join-executor.parallelism-min")
+                    .intType()
+                    .defaultValue(8)
+                    .withDescription(
+                            Description.builder()
+                                    .text(
+                                            "Min number of threads to cap factor-based parallelism number to.")
+                                    .build());
+
+    public static final ConfigOption<Integer> REMOTE_FORK_JOIN_EXECUTOR_PARALLELISM_MAX =
+            ConfigOptions.key("pekko.remote-fork-join-executor.parallelism-max")
+                    .intType()
+                    .defaultValue(16)
+                    .withDescription(
+                            Description.builder()
+                                    .text(
+                                            "Max number of threads to cap factor-based parallelism number to.")
+                                    .build());
+
     // ==================================================
     // Configurations for client-socket-work-pool.
     // ==================================================

diff --git a/...-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/ActorSystemBootstrapTools.java b/...-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/ActorSystemBootstrapTools.java
@@ -273,4 +273,17 @@ public static RpcSystem.ForkJoinExecutorConfiguration getForkJoinExecutorConfigu
         return new RpcSystem.ForkJoinExecutorConfiguration(
                 parallelismFactor, minParallelism, maxParallelism);
     }
+
+    public static RpcSystem.ForkJoinExecutorConfiguration getRemoteForkJoinExecutorConfiguration(
+            final Configuration configuration) {
+        final double parallelismFactor =
+                configuration.getDouble(AkkaOptions.REMOTE_FORK_JOIN_EXECUTOR_PARALLELISM_FACTOR);
+        final int minParallelism =
+                configuration.getInteger(AkkaOptions.REMOTE_FORK_JOIN_EXECUTOR_PARALLELISM_MIN);
+        final int maxParallelism =
+                configuration.getInteger(AkkaOptions.REMOTE_FORK_JOIN_EXECUTOR_PARALLELISM_MAX);
+
+        return new RpcSystem.ForkJoinExecutorConfiguration(
+                parallelismFactor, minParallelism, maxParallelism);
+    }
 }
diff --git a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/PekkoUtils.java b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/PekkoUtils.java
@@ -197,6 +197,9 @@ private static Config getRemoteConfig(
         addBaseRemoteConfig(builder, configuration, port, externalPort);
         addHostnameRemoteConfig(builder, bindAddress, externalHostname);
         addSslRemoteConfig(builder, configuration);
+        addRemoteForkJoinExecutorConfig(
+                builder,
+                ActorSystemBootstrapTools.getRemoteForkJoinExecutorConfiguration(configuration));
 
         return builder.build();
     }
@@ -384,6 +387,27 @@ private static void addSslRemoteConfig(
                 .add("}");
     }
 
+    private static Config addRemoteForkJoinExecutorConfig(
+            ConfigBuilder builder, RpcSystem.ForkJoinExecutorConfiguration configuration) {
+        final double parallelismFactor = configuration.getParallelismFactor();
+        final int minNumThreads = configuration.getMinParallelism();
+        final int maxNumThreads = configuration.getMaxParallelism();
+
+        return builder.add("pekko {")
+                .add("  remote {")
+                .add("    default-remote-dispatcher {")
+                .add("      executor = fork-join-executor")
+                .add("      fork-join-executor {")
+                .add("          parallelism-factor = " + parallelismFactor)
+                .add("          parallelism-min = " + minNumThreads)
+                .add("          parallelism-max = " + maxNumThreads)
+                .add("      }")
+                .add("    }")
+                .add("  }")
+                .add("}")
+                .build();
+    }
+
     /**
      * Creates a local actor system without remoting.
      *

diff --git a/...k-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/pekko/PekkoUtilsTest.java b/...k-rpc/flink-rpc-akka/src/test/java/org/apache/flink/runtime/rpc/pekko/PekkoUtilsTest.java
@@ -174,6 +174,15 @@ void getConfigDefaultsToForkJoinExecutor() {
                 .isEqualTo("fork-join-executor");
     }
 
+    @Test
+    void getConfigDefaultsToRemoteForkJoinExecutor() {
+        final Config config =
+                PekkoUtils.getConfig(new Configuration(), new HostAndPort("localhost", 1234));
+
+        assertThat(config.getString("pekko.remote.default-remote-dispatcher.executor"))
+                .isEqualTo("fork-join-executor");
+    }
+
     @Test
     void getConfigSetsExecutorWithThreadPriority() {
         final int threadPriority = 3;