From 251622df3dcd0833e298cd9f453b0a20e2d56650 Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Mon, 11 Mar 2024 14:55:22 -0500
Subject: [PATCH] migrated all internal dispatchers off the dedicated thread
 pool and onto default thread pool (#7117)

---
 src/core/Akka.Persistence/persistence.conf     | 10 +++++-----
 src/core/Akka.Remote/Configuration/Remote.conf |  4 ++--
 src/core/Akka/Configuration/akka.conf          |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/Akka.Persistence/persistence.conf b/src/core/Akka.Persistence/persistence.conf
index 4689d4e45b9..57f3e552b7a 100644
--- a/src/core/Akka.Persistence/persistence.conf
+++ b/src/core/Akka.Persistence/persistence.conf
@@ -77,13 +77,13 @@ akka.persistence {
         # Dispatcher used by every plugin which does not declare explicit
         # `plugin-dispatcher` field.
         default-plugin-dispatcher {
-            type = PinnedDispatcher
-            executor = "fork-join-executor"
+            type = Dispatcher
+            executor = "default-executor"
         }
         # Default dispatcher for message replay.
         default-replay-dispatcher {
-            type = ForkJoinDispatcher
-			executor = "fork-join-executor"
+            type = Dispatcher
+			executor = "default-executor"
             dedicated-thread-pool {
                 # Fixed number of threads to have in this threadpool
                 thread-count = 8
@@ -91,7 +91,7 @@ akka.persistence {
         }
         # Default dispatcher for streaming snapshot IO
         default-stream-dispatcher {
-            type = ForkJoinDispatcher
+            type = Dispatcher
             dedicated-thread-pool {
                 # Fixed number of threads to have in this threadpool
                 thread-count = 8
diff --git a/src/core/Akka.Remote/Configuration/Remote.conf b/src/core/Akka.Remote/Configuration/Remote.conf
index 612ea292878..9e6413ac0df 100644
--- a/src/core/Akka.Remote/Configuration/Remote.conf
+++ b/src/core/Akka.Remote/Configuration/Remote.conf
@@ -570,7 +570,7 @@ akka {
     ### Default dispatcher for the remoting subsystem
 
     default-remote-dispatcher {
-	    executor = fork-join-executor
+	    executor = default-executor
         fork-join-executor {
             parallelism-min = 2
             parallelism-factor = 0.5
@@ -580,7 +580,7 @@ akka {
     }
     
     backoff-remote-dispatcher {
-	    executor = fork-join-executor
+	    executor = default-executor
         fork-join-executor {
             parallelism-min = 2
             parallelism-max = 2
diff --git a/src/core/Akka/Configuration/akka.conf b/src/core/Akka/Configuration/akka.conf
index 933eefbd724..358f85e38a8 100644
--- a/src/core/Akka/Configuration/akka.conf
+++ b/src/core/Akka/Configuration/akka.conf
@@ -389,7 +389,7 @@ akka {
     # default dispatcher)
     internal-dispatcher {
       type = "Dispatcher"
-      executor = "fork-join-executor"
+      executor = "default-executor"
       throughput = 5
 
       fork-join-executor {
@@ -402,7 +402,7 @@ akka {
 
     default-blocking-io-dispatcher {
       type = "Dispatcher"
-      executor = "thread-pool-executor"
+      executor = "default-executor"
       throughput = 1
 
       # Akka.NET does not have a fine grained control over thread pool executor