Revert "SERVER-44984 reduce index build thread pool default and index build external sort memory limit default"

This reverts commit 0be749a16f4523b2a23729e0754a89ba5ea99644.

5 files changed, 17 insertions, 20 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index d1314b6f291..92f572029cf 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -5112,10 +5112,12 @@ tasks:
       num_tasks: 10
       jstestfuzz_vars: --jsTestsDir ../jstests
       suite: jstestfuzz_sharded_continuous_stepdown
+      # TODO(SERVER-44896): Remove enableTwoPhaseIndexBuild from server parameters when two phase
+      # index builds work with this flow control setting.
       resmoke_args: >-
           --flowControlTicketOverride=3
           --storageEngine=wiredTiger
-          --mongodSetParameters="{logComponentVerbosity: {command: 2}}"
+          --mongodSetParameters="{logComponentVerbosity: {command: 2}, enableTwoPhaseIndexBuild: false}"
       name: jstestfuzz_sharded_continuous_stepdown_flow_control
 
 ## jstestfuzz concurrent sharded cluster continuous stepdown with flow control engaged ##
@@ -5130,10 +5132,13 @@ tasks:
       num_tasks: 2
       jstestfuzz_vars: --jsTestsDir ../jstests
       suite: jstestfuzz_sharded_continuous_stepdown
+      # TODO(SERVER-44896): Remove enableTwoPhaseIndexBuild from server parameters when two phase
+      # index builds work with this flow control setting.
       resmoke_args: >-
           --flowControlTicketOverride=30
           --storageEngine=wiredTiger
           --numClientsPerFixture=10
+          --mongodSetParameters="{enableTwoPhaseIndexBuild: false}"
       name: jstestfuzz_concurrent_sharded_continuous_stepdown_flow_control
 
 # jstestfuzz replication continuous stepdown with flow control engaged #
@@ -5148,10 +5153,12 @@ tasks:
       num_tasks: 30
       jstestfuzz_vars: --jsTestsDir ../jstests
       suite: jstestfuzz_replication_continuous_stepdown
+      # TODO(SERVER-44896): Remove enableTwoPhaseIndexBuild from server parameters when two phase
+      # index builds work with this flow control setting.
       resmoke_args: >-
           --flowControlTicketOverride=1
           --storageEngine=wiredTiger
-          --mongodSetParameters="{logComponentVerbosity: {command: 2}}"
+          --mongodSetParameters="{logComponentVerbosity: {command: 2}, enableTwoPhaseIndexBuild: false}"
       name: jstestfuzz_replication_continuous_stepdown_flow_control
 
 ## jstestfuzz concurrent replication continuous stepdown with flow control engaged ##
@@ -5166,10 +5173,13 @@ tasks:
       num_tasks: 15
       jstestfuzz_vars: --jsTestsDir ../jstests
       suite: jstestfuzz_replication_continuous_stepdown
+      # TODO(SERVER-44896): Remove enableTwoPhaseIndexBuild from server parameters when two phase
+      # index builds work with this flow control setting.
       resmoke_args: >-
           --flowControlTicketOverride=10
           --storageEngine=wiredTiger
           --numClientsPerFixture=10
+          --mongodSetParameters="{enableTwoPhaseIndexBuild: false}"
       name: jstestfuzz_concurrent_replication_continuous_stepdown_flow_control
 
 ## jstestfuzz replica set ##
diff --git a/src/mongo/db/catalog/multi_index_block.idl b/src/mongo/db/catalog/multi_index_block.idl
index 311a7f701f1..08b183e3560 100644
--- a/src/mongo/db/catalog/multi_index_block.idl
+++ b/src/mongo/db/catalog/multi_index_block.idl
@@ -52,12 +52,12 @@ server_parameters:
     default: true
 
   maxIndexBuildMemoryUsageMegabytes:
-    description: "Limits the amount of memory that simultaneous index builds on one collection may consume for the duration of the builds"
+    description: "Limits the amount of memory that simultaneous foreground index builds on one collection may consume for the duration of the builds"
     set_at:
       - runtime
       - startup
     cpp_varname: maxIndexBuildMemoryUsageMegabytes
     cpp_vartype: AtomicWord<int>
-    default: 200
+    default: 500
     validator:
-      gte: 50
+      gte: 100
diff --git a/src/mongo/db/index_builds_coordinator_mongod.cpp b/src/mongo/db/index_builds_coordinator_mongod.cpp
index 9bd0f46bfb9..cc915a7a6c3 100644
--- a/src/mongo/db/index_builds_coordinator_mongod.cpp
+++ b/src/mongo/db/index_builds_coordinator_mongod.cpp
@@ -64,7 +64,7 @@ ThreadPool::Options makeDefaultThreadPoolOptions() {
     // We depend on thread pool sizes being equal between primaries and secondaries. If a secondary
     // has fewer resources than a primary, index build oplog entries can replicate in an order that
     // the secondary is unable to fulfill, leading to deadlocks. See SERVER-44250.
-    options.maxThreads = 3;
+    options.maxThreads = 10;
 
     // Ensure all threads have a client.
     options.onCreateThread = [](const std::string& threadName) {
@@ -80,10 +80,6 @@ IndexBuildsCoordinatorMongod::IndexBuildsCoordinatorMongod()
     : _threadPool(makeDefaultThreadPoolOptions()) {
     _threadPool.startup();
 }
-IndexBuildsCoordinatorMongod::IndexBuildsCoordinatorMongod(ThreadPool::Options options)
-    : _threadPool(std::move(options)) {
-    _threadPool.startup();
-}
 
 void IndexBuildsCoordinatorMongod::shutdown() {
     // Stop new scheduling.
diff --git a/src/mongo/db/index_builds_coordinator_mongod.h b/src/mongo/db/index_builds_coordinator_mongod.h
index e9569621d5e..20691de7751 100644
--- a/src/mongo/db/index_builds_coordinator_mongod.h
+++ b/src/mongo/db/index_builds_coordinator_mongod.h
@@ -55,7 +55,6 @@ public:
      * Sets up the thread pool.
      */
     IndexBuildsCoordinatorMongod();
-    IndexBuildsCoordinatorMongod(ThreadPool::Options options);
 
     /**
      * Shuts down the thread pool, signals interrupt to all index builds, then waits for all of the
diff --git a/src/mongo/db/index_builds_coordinator_mongod_test.cpp b/src/mongo/db/index_builds_coordinator_mongod_test.cpp
index 64cf3c8c487..8a9939579b4 100644
--- a/src/mongo/db/index_builds_coordinator_mongod_test.cpp
+++ b/src/mongo/db/index_builds_coordinator_mongod_test.cpp
@@ -73,15 +73,7 @@ void IndexBuildsCoordinatorMongodTest::setUp() {
     createCollection(_testFooNss, _testFooUUID);
     createCollection(_testBarNss, _testBarUUID);
     createCollection(_othertestFooNss, _othertestFooUUID);
-
-    ThreadPool::Options options;
-    options.poolName = "IndexBuildsCoordinatorMongod";
-    options.minThreads = 0;
-    options.maxThreads = 5;
-    options.onCreateThread = [](const std::string& threadName) {
-        Client::initThread(threadName.c_str());
-    };
-    _indexBuildsCoord = std::make_unique<IndexBuildsCoordinatorMongod>(options);
+    _indexBuildsCoord = std::make_unique<IndexBuildsCoordinatorMongod>();
 }
 
 void IndexBuildsCoordinatorMongodTest::tearDown() {