diff --git a/source/includes/fact-platform-s390x-enterprise.rst b/source/includes/fact-platform-s390x-enterprise.rst index d798d1eefed..a0d3d09607f 100644 --- a/source/includes/fact-platform-s390x-enterprise.rst +++ b/source/includes/fact-platform-s390x-enterprise.rst @@ -4,8 +4,14 @@ :widths: 20 80 :class: border-table + * - RHEL 6 s390x + - Support removed in MongoDB Enterprise 4.2.15. + + * - SLES 12 s390x + - Support removed in MongoDB Enterprise 4.2.15. + * - Ubuntu 18.04 s390x - - Support removed in MongoDB 4.2.15 Enterprise. + - Support removed in MongoDB Enterprise 4.2.15. | @@ -27,13 +33,13 @@ - Removed starting in 3.4.15 * - RHEL/CentOS 6 - - 4.2.4+ + - 4.2.4 - 4.2.14 - |checkmark| - Removed starting in 3.6.14 - Removed starting in 3.4.22 * - SLES 12 - - |checkmark| + - Removed starting in 4.2.15 - 4.0.6+ - Removed starting in 3.6.17 - Removed starting in 3.4.14 diff --git a/source/includes/fact-platform-support-enterprise-suse.rst b/source/includes/fact-platform-support-enterprise-suse.rst index 2c983f518b6..206093af6fc 100644 --- a/source/includes/fact-platform-support-enterprise-suse.rst +++ b/source/includes/fact-platform-support-enterprise-suse.rst @@ -9,11 +9,6 @@ MongoDB {+version+} Enterprise Edition supports the following MongoDB only supports the 64-bit versions of these platforms. -MongoDB {+version+} Enterprise Edition on -:abbr:`SLES (SUSE Linux Enterprise Server)` also supports the -:ref:`s390x` architecture on -select platforms. - See :ref:`prod-notes-supported-platforms` for more information. .. include:: /includes/admonition-wsl.rst diff --git a/source/reference/configuration-options.txt b/source/reference/configuration-options.txt index 233a125f8d0..de4b4a49437 100644 --- a/source/reference/configuration-options.txt +++ b/source/reference/configuration-options.txt @@ -2699,7 +2699,7 @@ Key Management Configuration Options *Type*: string - .. versionadded:: 4.0 + .. versionadded:: 4.0 (and 4.2.15) Available on Windows and macOS as an alternative to :setting:`security.kmip.clientCertificateFile`. @@ -2715,7 +2715,7 @@ Key Management Configuration Options where the property can be one of the following: .. include:: /includes/extracts/ssl-facts-certificate-selector-properties.rst - + .. include:: /includes/fact-enterprise-only-admonition.rst diff --git a/source/reference/parameters.txt b/source/reference/parameters.txt index fb08008ad15..bc6571bcec8 100644 --- a/source/reference/parameters.txt +++ b/source/reference/parameters.txt @@ -1848,11 +1848,40 @@ Replication Parameters |mongod-only| - Number of threads to use to apply replicated operations in parallel. - Values can range from 1 to 256 inclusive. You can only set + Maximum number of threads to use to apply replicated operations in + parallel. Values can range from 1 to 256 inclusive. You can only set :parameter:`replWriterThreadCount` at startup and cannot change this setting with the :dbcommand:`setParameter` command. + .. seealso:: + + :parameter:`replWriterMinThreadCount` + +.. parameter:: replWriterMinThreadCount + + .. versionadded:: 4.2.15 + + *Type*: integer + + *Default*: 0 + + |mongod-only| + + Minimum number of threads to use to apply replicated operations in + parallel. Values can range from 0 to 256 inclusive. You can only set + :parameter:`replWriterMinThreadCount` at startup and cannot change + this setting with the :dbcommand:`setParameter` command. + + Parallel application of replication operations uses up to + :parameter:`replWriterThreadCount` threads. If + :parameter:`replWriterMinThreadCount` is configured with a value + less than :parameter:`replWriterThreadCount`, the thread pool will + timeout idle threads until the total count of threads in the thread + pool is equal to :parameter:`replWriterMinThreadCount`. + + :parameter:`replWriterMinThreadCount` must be configured with a value + that is less than or equal to :parameter:`replWriterThreadCount`. + .. parameter:: rollbackTimeLimitSecs *Type*: 64-bit integer diff --git a/source/reference/program/mongod.txt b/source/reference/program/mongod.txt index c3401f19a2c..fbb35413ca3 100644 --- a/source/reference/program/mongod.txt +++ b/source/reference/program/mongod.txt @@ -3223,7 +3223,7 @@ Encryption Key Management Options .. option:: --kmipClientCertificateSelector - .. versionadded:: 4.0 + .. versionadded:: 4.0 (and 4.2.15) Available on Windows and macOS as an alternative to :option:`--kmipClientCertificateFile`. diff --git a/source/release-notes/4.0.txt b/source/release-notes/4.0.txt index 61bc3aa69c1..9bbc0da90d4 100644 --- a/source/release-notes/4.0.txt +++ b/source/release-notes/4.0.txt @@ -1046,9 +1046,8 @@ and macOS for internal TLS/SSL communication within a cluster. The option :option:`--kmipClientCertificateSelector ` (:setting:`security.kmip.clientCertificateSelector`) allows -:binary:`~bin.mongod` and :binary:`~bin.mongos` to use system TLS/SSL -certificate stores for Windows and macOS when using TLS/SSL connection to the -KMIP server. +:binary:`~bin.mongod` to use system TLS/SSL certificate stores for +Windows and macOS when using TLS/SSL connection to the KMIP server. .. _4.0-deprecate-mmapv1: