From 5a5f48bf0096bec25c2b529caa633431e5fee70f Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Wed, 19 Feb 2025 16:38:54 -0500 Subject: [PATCH 01/12] Resolving merge conflicts --- snooty.toml | 8 ++++---- source/release-notes.txt | 2 -- source/release-notes/1.12.txt | 8 ++------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/snooty.toml b/snooty.toml index 9db29470a..e71544fe3 100644 --- a/snooty.toml +++ b/snooty.toml @@ -28,10 +28,10 @@ toc_landing_pages = ["/quickstart", ] [constants] -version = "1.11" -version-previous = "1.10" -latest-version="1.11.0" -version-dev = "1.11" +version = "1.12" +version-previous = "1.11" +latest-version="1.12.0" +version-dev = "1.12" c2c-product-name = "Cluster-to-Cluster Sync" c2c-full-product-name = "MongoDB Cluster-to-Cluster Sync" mdb-download-center = "`MongoDB Download Center `__" diff --git a/source/release-notes.txt b/source/release-notes.txt index b74f919dd..4599b03d2 100644 --- a/source/release-notes.txt +++ b/source/release-notes.txt @@ -1,5 +1,3 @@ -.. place holder for the release notes TOC - ============= Release Notes ============= diff --git a/source/release-notes/1.12.txt b/source/release-notes/1.12.txt index ee1eda799..a378546ce 100644 --- a/source/release-notes/1.12.txt +++ b/source/release-notes/1.12.txt @@ -20,6 +20,8 @@ This page describes changes and new features introduced in 1.12.0 Release -------------- +**February 19, 2025** + ``enableUserWriteBlocking`` parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -34,9 +36,3 @@ Use these options instead of the old ``true`` and ``false`` values. for backward compatibility. See :ref:`c2c-api-start-params`. - -Live Upgrades -~~~~~~~~~~~~~ - -:ref:`Live upgrades ` -to version 1.12 are not supported. \ No newline at end of file From 1d08e775f4d676140a44064aaece5d8b9066f218 Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Wed, 19 Feb 2025 16:40:59 -0500 Subject: [PATCH 02/12] Reesolving conflicts --- source/reference/supported-server-version.txt | 5 +++++ source/release-notes/1.12.txt | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/source/reference/supported-server-version.txt b/source/reference/supported-server-version.txt index 3beb8b5aa..35525e4c4 100644 --- a/source/reference/supported-server-version.txt +++ b/source/reference/supported-server-version.txt @@ -23,6 +23,7 @@ version limitations and requirements: - 5.0 (*New in version 1.10.0*) - 6.0 - 7.0 + - 8.0 (*New in version 1.12.0*) - ``mongosync`` doesn't support MongoDB rapid releases, such as 6.1 or 6.2. @@ -53,6 +54,10 @@ clusters: - 7.0.13 - 6.0 + * - 8.0 + - 8.0 + - 8.0 + .. _c2c-sync-different-versions: Synchronize Data Between Clusters with Different MongoDB Server Major Versions diff --git a/source/release-notes/1.12.txt b/source/release-notes/1.12.txt index a378546ce..40624243f 100644 --- a/source/release-notes/1.12.txt +++ b/source/release-notes/1.12.txt @@ -36,3 +36,23 @@ Use these options instead of the old ``true`` and ``false`` values. for backward compatibility. See :ref:`c2c-api-start-params`. + +Live Upgrades +~~~~~~~~~~~~~ + +:ref:`Live upgrades ` +to version 1.12 are not supported. + +Other Notes +~~~~~~~~~~~ + +Fixed Issues: + +- Fixed + +Minimum Supported Version +------------------------- + +.. include:: /includes/fact-version-compatibility.rst + +.. include:: /includes/migration-upgrade-recommendation.rst From ac7107d8074cb7ff9cbacfe244481666c96b65d5 Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Tue, 18 Feb 2025 14:06:05 -0500 Subject: [PATCH 03/12] Added relnote --- source/release-notes/1.12.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/release-notes/1.12.txt b/source/release-notes/1.12.txt index 40624243f..b13e2994f 100644 --- a/source/release-notes/1.12.txt +++ b/source/release-notes/1.12.txt @@ -46,9 +46,7 @@ to version 1.12 are not supported. Other Notes ~~~~~~~~~~~ -Fixed Issues: - -- Fixed +- Added a machine-friendly label to warnings about Persisted Query Settings Minimum Supported Version ------------------------- From 8b741039e4d56cc8e47ea065646ce9d10567a6b2 Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Tue, 18 Feb 2025 14:14:04 -0500 Subject: [PATCH 04/12] version bump --- source/reference/supported-server-version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/reference/supported-server-version.txt b/source/reference/supported-server-version.txt index 35525e4c4..a1646fda2 100644 --- a/source/reference/supported-server-version.txt +++ b/source/reference/supported-server-version.txt @@ -55,8 +55,8 @@ clusters: - 6.0 * - 8.0 - - 8.0 - - 8.0 + - 8.0.5 + - 6.0 .. _c2c-sync-different-versions: From 302f7d58124a7ec30e34756b0375b29ce4a5310f Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Tue, 18 Feb 2025 14:16:56 -0500 Subject: [PATCH 05/12] removed notices of partial support for 8.0, and workarounds --- source/includes/fact-partial-8.0-support.rst | 3 --- source/reference/mongosync.txt | 2 -- source/reference/supported-server-version.txt | 22 ++----------------- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 source/includes/fact-partial-8.0-support.rst diff --git a/source/includes/fact-partial-8.0-support.rst b/source/includes/fact-partial-8.0-support.rst deleted file mode 100644 index ce5562d42..000000000 --- a/source/includes/fact-partial-8.0-support.rst +++ /dev/null @@ -1,3 +0,0 @@ -Starting in version 1.10, ``mongosync`` supports migrations to destination -clusters that use MongoDB 8.0. The source must be a pre-8.0 cluster. -To migrate from 8.0 source clusters, see :ref:`c2c-server-8.0-to-8.0`. \ No newline at end of file diff --git a/source/reference/mongosync.txt b/source/reference/mongosync.txt index c77a353b8..8d184fda5 100644 --- a/source/reference/mongosync.txt +++ b/source/reference/mongosync.txt @@ -34,8 +34,6 @@ The :ref:`Frequently Asked Questions (FAQ) ` page addresses questions u Compatibility ------------- -- .. include:: /includes/fact-partial-8.0-support.rst - - .. include:: /includes/fact-minimum-server-version-support.rst You can migrate data on clusters (source) with versions of MongoDB diff --git a/source/reference/supported-server-version.txt b/source/reference/supported-server-version.txt index a1646fda2..dd487d354 100644 --- a/source/reference/supported-server-version.txt +++ b/source/reference/supported-server-version.txt @@ -13,9 +13,7 @@ MongoDB Server Version Compatibility :class: singlecol Before you run {+c2c-product-name+}, consider the following MongoDB server -version limitations and requirements: - -- .. include:: /includes/fact-partial-8.0-support.rst +version limitations and requirements: - Your source cluster must run one of the following major supported versions: @@ -78,20 +76,4 @@ destination MongoDB server versions: .. seealso:: - :ref:`Pre-6.0 Migration Limitations ` - -.. _c2c-server-8.0-to-8.0: - -Synchronize Data Between Two 8.0 Clusters -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -To migrate data between two 8.0 clusters: - -- Use :ref:`mongodump` to export data from the source cluster. -- Use :ref:`mongorestore` to import the data into the destination cluster. - -For limitations on using ``mongodump`` and ``mongorestore``, see -:ref:`mongorestore-behavior-access-usage`. - -Alternatively, you can :ref:`downgrade your 8.0 source cluster <8.0-downgrade>` -to 7.0 and then migrate your data into an 8.0 destination cluster. + :ref:`Pre-6.0 Migration Limitations ` \ No newline at end of file From 7ac7b750299dcd44ade2cd6716cc2e1e2ba22f85 Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Tue, 18 Feb 2025 14:25:57 -0500 Subject: [PATCH 06/12] Version bump, updated table --- source/includes/table-pre-6.0-compatibility.rst | 2 +- source/reference/supported-server-version.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/includes/table-pre-6.0-compatibility.rst b/source/includes/table-pre-6.0-compatibility.rst index c41cbf831..57ae04b7f 100644 --- a/source/includes/table-pre-6.0-compatibility.rst +++ b/source/includes/table-pre-6.0-compatibility.rst @@ -30,5 +30,5 @@ * - **8.0 Source** - - - - + - √ diff --git a/source/reference/supported-server-version.txt b/source/reference/supported-server-version.txt index dd487d354..6b94c63ac 100644 --- a/source/reference/supported-server-version.txt +++ b/source/reference/supported-server-version.txt @@ -53,8 +53,8 @@ clusters: - 6.0 * - 8.0 - - 8.0.5 - - 6.0 + - 8.0 + - 8.0 .. _c2c-sync-different-versions: From 26dadd4e2aae35831e8042105741b2abb673449f Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Tue, 18 Feb 2025 14:38:46 -0500 Subject: [PATCH 07/12] Rendering: table width --- source/includes/table-pre-6.0-compatibility.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/includes/table-pre-6.0-compatibility.rst b/source/includes/table-pre-6.0-compatibility.rst index 57ae04b7f..927b41026 100644 --- a/source/includes/table-pre-6.0-compatibility.rst +++ b/source/includes/table-pre-6.0-compatibility.rst @@ -1,7 +1,7 @@ .. list-table:: :header-rows: 1 :stub-columns: 1 - :widths: 30 14 14 14 + :widths: 20 14 14 14 * - - **6.0 Destination** From f339ad87c2c7615a479696fef1f722563e0855ed Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Tue, 18 Feb 2025 14:41:24 -0500 Subject: [PATCH 08/12] Fixed a couple of drawer pages --- snooty.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snooty.toml b/snooty.toml index e71544fe3..611abdd31 100644 --- a/snooty.toml +++ b/snooty.toml @@ -14,12 +14,12 @@ intersphinx = [ "https://www.mongodb.com/docs/atlas/objects.inv", toc_landing_pages = ["/quickstart", "/installation", - "reference/reference", + "/reference", "/connecting", "/topologies", "/using-mongosync", "/multiple-mongosyncs", - "/release-notes/release-notes", + "/release-notes", "/faq", "/reference/collection-level-filtering", "/reference/verification", From 78fa5bf0f68eb326e6048abf3a51b1ff00865db4 Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Wed, 19 Feb 2025 09:28:12 -0500 Subject: [PATCH 09/12] Added 8.0 to release notes --- source/release-notes/1.12.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/release-notes/1.12.txt b/source/release-notes/1.12.txt index b13e2994f..01db9c59e 100644 --- a/source/release-notes/1.12.txt +++ b/source/release-notes/1.12.txt @@ -22,6 +22,13 @@ This page describes changes and new features introduced in **February 19, 2025** +MongoDB 8.0 support +~~~~~~~~~~~~~~~~~~~ + +{+c2c-full-product-name+} 1.12 adds support for MongoDB 8.0. For a full list of +supported versions, see :ref:`c2c-server-version-compatibility`. + + ``enableUserWriteBlocking`` parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From e9241b6de59e24501c4f288c72c2587adc6cfb54 Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Wed, 19 Feb 2025 10:54:29 -0500 Subject: [PATCH 10/12] Added PQS limitations --- source/reference/limitations.txt | 7 +++++++ source/release-notes/1.12.txt | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index 361b09c0b..adbc9a70c 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -200,6 +200,13 @@ cluster. .. include:: /includes/fact-verifier-limitations +Persistent Query Settings +------------------------- + +``mongosync`` doesn't migrate Persistent Query Settings (PQS), which were +introduced in MongoDB 8.0. If your source cluster uses PQS, you must +:ref:`migrate them manually ` + .. _c2c-older-version-limitations: Pre-6.0 Migrations diff --git a/source/release-notes/1.12.txt b/source/release-notes/1.12.txt index 01db9c59e..bd66399c8 100644 --- a/source/release-notes/1.12.txt +++ b/source/release-notes/1.12.txt @@ -25,8 +25,11 @@ This page describes changes and new features introduced in MongoDB 8.0 support ~~~~~~~~~~~~~~~~~~~ -{+c2c-full-product-name+} 1.12 adds support for MongoDB 8.0. For a full list of -supported versions, see :ref:`c2c-server-version-compatibility`. +{+c2c-full-product-name+} 1.12 adds support for MongoDB 8.0. However, it does +not migrate Persistent Query Settings (PQS), which are new in 8.0. If your +source cluster uses PQS, you must :ref:`migrate them manually `. + +For a full list of supported versions, see :ref:`c2c-server-version-compatibility`. ``enableUserWriteBlocking`` parameters From 329db339cbfecd56cec940edec58f5113a0f3a8f Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Wed, 19 Feb 2025 16:16:35 -0500 Subject: [PATCH 11/12] Updated wording to specify source cluster --- source/release-notes/1.12.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/release-notes/1.12.txt b/source/release-notes/1.12.txt index bd66399c8..300024c56 100644 --- a/source/release-notes/1.12.txt +++ b/source/release-notes/1.12.txt @@ -25,9 +25,10 @@ This page describes changes and new features introduced in MongoDB 8.0 support ~~~~~~~~~~~~~~~~~~~ -{+c2c-full-product-name+} 1.12 adds support for MongoDB 8.0. However, it does -not migrate Persistent Query Settings (PQS), which are new in 8.0. If your -source cluster uses PQS, you must :ref:`migrate them manually `. +{+c2c-full-product-name+} 1.12 adds support for MongoDB 8.0 on the source +cluster. However, it does not migrate Persistent Query Settings (PQS), which +are new in 8.0. If your source cluster uses PQS, you must :ref:`migrate them +manually `. For a full list of supported versions, see :ref:`c2c-server-version-compatibility`. From dc8657841882e3c5e89b0c52f56a31b56c485b83 Mon Sep 17 00:00:00 2001 From: Nick Villahermosa Date: Wed, 19 Feb 2025 17:11:09 -0500 Subject: [PATCH 12/12] Typo --- source/reference/limitations.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index adbc9a70c..4386e9d67 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -205,7 +205,7 @@ Persistent Query Settings ``mongosync`` doesn't migrate Persistent Query Settings (PQS), which were introduced in MongoDB 8.0. If your source cluster uses PQS, you must -:ref:`migrate them manually ` +:ref:`migrate them manually `. .. _c2c-older-version-limitations: