diff --git a/source/includes/extracts-manage-journaling.yaml b/source/includes/extracts-manage-journaling.yaml index c364fd750df..4fb4c328b7b 100644 --- a/source/includes/extracts-manage-journaling.yaml +++ b/source/includes/extracts-manage-journaling.yaml @@ -21,17 +21,6 @@ content: | :setting:`~storage.journal.commitIntervalMs` for more information on the default. --- -ref: journaling-enable-journaling -content: | - Enable Journaling - ~~~~~~~~~~~~~~~~~ - - For 64-bit builds of :program:`mongod`, journaling is enabled by - default. - - To enable journaling, start :program:`mongod` with the - :option:`--journal ` command line option. ---- ref: journaling-disable-journaling content: | Disable Journaling @@ -47,6 +36,8 @@ content: | :term:`replica set` member or backup, as described in :doc:`repair `. + .. include:: /includes/wiredtiger-node-nojournal.rst + To disable journaling, start :program:`mongod` with the :option:`--nojournal ` command line option. --- diff --git a/source/includes/not-available-for-inmemory-storage-engine.rst b/source/includes/not-available-for-inmemory-storage-engine.rst index d310b9985af..747e8ea53f4 100644 --- a/source/includes/not-available-for-inmemory-storage-engine.rst +++ b/source/includes/not-available-for-inmemory-storage-engine.rst @@ -1,2 +1,2 @@ -Not available for :program:`mongod` instances that use the in-memory -storage engine. +Not available for :program:`mongod` instances that use the +:doc:`in-memory storage engine `. diff --git a/source/includes/options-mongod.yaml b/source/includes/options-mongod.yaml index 48d8bd40821..d41c0d84f1b 100644 --- a/source/includes/options-mongod.yaml +++ b/source/includes/options-mongod.yaml @@ -638,10 +638,12 @@ name: nojournal args: null directive: option description: | - Disables the durability journaling. The {{program}} instance - enables journaling by default in 64-bit versions after v2.0. + Disables :doc:`journaling `. {{program}} + enables journaling by default. post: | .. include:: /includes/not-available-for-inmemory-storage-engine.rst + + .. include:: /includes/wiredtiger-node-nojournal.rst optional: true --- program: mongod diff --git a/source/includes/options-shared.yaml b/source/includes/options-shared.yaml index 6a11aed56e7..2c7eb9eed9e 100644 --- a/source/includes/options-shared.yaml +++ b/source/includes/options-shared.yaml @@ -429,8 +429,7 @@ directive: option description: | {{intro}} the durability :term:`journal` to ensure data files remain valid and recoverable. This option applies only when you specify the - :option:`--dbpath` option. The {{program}} enables journaling by default - on 64-bit builds of versions after 2.0. + :option:`--dbpath` option. {{program}} enables journaling by default. optional: true replacement: intro: "Enables" diff --git a/source/includes/wiredtiger-node-nojournal.rst b/source/includes/wiredtiger-node-nojournal.rst new file mode 100644 index 00000000000..b0367365707 --- /dev/null +++ b/source/includes/wiredtiger-node-nojournal.rst @@ -0,0 +1,4 @@ +:doc:`Replica set members ` which use the +WiredTiger :doc:`storage engine ` should not +use the :option:`--nojournal` option. For more information about +journaling, see :doc:`/tutorial/manage-journaling`. diff --git a/source/release-notes/3.6-compatibility.txt b/source/release-notes/3.6-compatibility.txt index 8ccf677460b..bbad0960647 100644 --- a/source/release-notes/3.6-compatibility.txt +++ b/source/release-notes/3.6-compatibility.txt @@ -416,6 +416,11 @@ index keys. To delete existing indexes named ``*``, delete the index before upgrading. To rename them, delete and recreate the index. +``--nojournal`` Option with WiredTiger +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. include:: /includes/wiredtiger-node-nojournal.rst + Platform Support ---------------- diff --git a/source/tutorial/manage-journaling.txt b/source/tutorial/manage-journaling.txt index 49692c6a5db..3922efc4ffb 100644 --- a/source/tutorial/manage-journaling.txt +++ b/source/tutorial/manage-journaling.txt @@ -15,8 +15,6 @@ Manage Journaling Procedures ---------- -.. include:: /includes/extracts/journaling-enable-journaling.rst - .. include:: /includes/extracts/journaling-disable-journaling.rst .. include:: /includes/extracts/journaling-get-commit-acknowledgement.rst