From 887bbaf68eb8ff00d37f8c1861db484a5ba13e6a Mon Sep 17 00:00:00 2001
From: Naomi Pentrel <5212232+npentrel@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:30:25 +0200
Subject: [PATCH] DOCS-13659: Add findChunksOnConfigTimeoutMS parameter

---
 source/reference/parameters.txt | 29 +++++++++++++++++++++++++++--
 source/release-notes/5.0.txt    |  7 +++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/source/reference/parameters.txt b/source/reference/parameters.txt
index f45730228c9..47bdbf5970f 100644
--- a/source/reference/parameters.txt
+++ b/source/reference/parameters.txt
@@ -57,6 +57,7 @@ Authentication Parameters
 .. parameter:: authenticationMechanisms
 
    .. versionchanged:: 4.0
+
       Remove support for the deprecated ``MONGODB-CR`` authentication mechanism.
 
    |both|
@@ -867,6 +868,7 @@ General Parameters
    retaining connections above this limit.
 
    .. note::
+
       The parameter is separate from the connections in TaskExecutor
       pools. See :parameter:`ShardingTaskExecutorPoolMaxSize`.
 
@@ -940,6 +942,7 @@ General Parameters
    excess of the value of :parameter:`connPoolMaxConnsPerHost`.
 
    .. note::
+
       The parameter is separate from the connections in TaskExecutor
       pools. See :parameter:`ShardingTaskExecutorPoolMaxSize`.
 
@@ -1854,6 +1857,7 @@ The following parameters support diagnostic data capture (FTDC):
    .. versionadded:: 3.2
 
    .. versionchanged:: 3.4
+
       Increased default size to 200 megabytes.
 
    .. versionchanged:: 3.4.14
@@ -3056,8 +3060,7 @@ Sharding Parameters
 .. parameter:: ShardingTaskExecutorPoolReplicaSetMatching
 
    .. versionadded:: 4.2
-   .. versionchanged:: 5.0 (*Also starting in 4.4.5 and
-      4.2.13*)
+   .. versionchanged:: 5.0 (*Also starting in 4.4.5 and 4.2.13*)
 
    Type: string
 
@@ -3545,6 +3548,28 @@ Sharding Parameters
 
    - MongoDB 3.4.11+
 
+.. parameter:: findChunksOnConfigTimeoutMS
+
+   .. versionadded:: 5.0
+
+   |both|
+
+   Type: Non-negative integer
+
+   Default: 900000
+
+   The timeout in milliseconds for find operations on
+   :data:`~config.chunks`.
+
+   If there is a large number of chunks in the cluster and chunk loading
+   fails with the error ``ExceededTimeLimit``, increase the parameter
+   value:
+
+   .. code-block:: bash
+
+      mongod --setParameter findChunksOnConfigTimeoutMS=1000000
+
+
 Storage Parameters
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/source/release-notes/5.0.txt b/source/release-notes/5.0.txt
index 6b4d2cdaacb..f9496e93135 100644
--- a/source/release-notes/5.0.txt
+++ b/source/release-notes/5.0.txt
@@ -550,6 +550,13 @@ Starting in MongoDB 5.0, the :dbcommand:`setParameter` command has a new
 :parameter:`maxValidateMemoryUsageMB` parameter, which sets the maximum
 memory usage for the :dbcommand:`validate` command.
 
+``findChunksOnConfigTimeoutMS`` Server Parameter
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Starting in MongoDB 5.0, you can use the
+:parameter:`findChunksOnConfigTimeoutMS` parameter to change the timout
+for find operations on :data:`~config.chunks`.
+
 Database Profiler ``filter`` Option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~