From 19f307054b294d49f96f2521a10f906d9c331a77 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Tue, 12 Sep 2023 17:12:16 -0700 Subject: [PATCH 01/14] DOCSP-29501-time-series --- source/includes/opts/skipTimeseriesHandling.rst | 3 +++ source/reference/configuration.txt | 9 +++++++++ source/reference/mongosync.txt | 7 +++++++ 3 files changed, 19 insertions(+) create mode 100644 source/includes/opts/skipTimeseriesHandling.rst diff --git a/source/includes/opts/skipTimeseriesHandling.rst b/source/includes/opts/skipTimeseriesHandling.rst new file mode 100644 index 000000000..337d757d6 --- /dev/null +++ b/source/includes/opts/skipTimeseriesHandling.rst @@ -0,0 +1,3 @@ +.. versionadded:: 1.7.0 + +Ignores time series collections. diff --git a/source/reference/configuration.txt b/source/reference/configuration.txt index d3b8dd988..bea9c0a9c 100644 --- a/source/reference/configuration.txt +++ b/source/reference/configuration.txt @@ -120,6 +120,15 @@ Options To set the ``port`` setting from the command line, see the :option:`--port` option. +.. setting:: skipTimeseriesHandling + + *Type*: string + + .. include:: /includes/opts/skipTimeseriesHandling + + To set the ``skipTimeseriesHandling`` setting from the command line, + see the :option:`--skipTimeseriesHandling` option. + .. setting:: verbosity *Type*: string diff --git a/source/reference/mongosync.txt b/source/reference/mongosync.txt index 61fb33290..39211d536 100644 --- a/source/reference/mongosync.txt +++ b/source/reference/mongosync.txt @@ -115,6 +115,13 @@ Global Options To set the ``--port`` option from a configuration file, see the :setting:`port` setting. +.. option:: --skipTimeseriesHandling + + .. include:: /includes/opts/skipTimeseriesHandling.rst + + To set the ``--skipTimeseriesHandling`` option from a configuration + file, see the :setting:`skipTimeseriesHandling` setting. + .. option:: --verbosity .. |verbosity-opt-type| replace:: option From 00cc73141833d35af2708612b1a2858af7f38b28 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 13 Sep 2023 14:32:16 -0700 Subject: [PATCH 02/14] DOCSP-29501-time-series --- source/includes/opts/skipTimeseriesHandling.rst | 17 +++++++++++++++-- source/reference/configuration.txt | 9 --------- source/reference/mongosync.txt | 3 --- source/release-notes/1.6.txt | 9 +++++++++ source/release-notes/1.7.txt | 3 +++ 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/source/includes/opts/skipTimeseriesHandling.rst b/source/includes/opts/skipTimeseriesHandling.rst index 337d757d6..145d7885c 100644 --- a/source/includes/opts/skipTimeseriesHandling.rst +++ b/source/includes/opts/skipTimeseriesHandling.rst @@ -1,3 +1,16 @@ -.. versionadded:: 1.7.0 +.. versionadded:: 1.6.0 -Ignores time series collections. +Can be set to these strings: + +- ``abort``, which means ``mongosync`` ends if a time series collection + is found. +- ``skip``, which means ``mongosync`` ignores time series collections. + +In mongosync 1.6 and 1.7, and MongoDB 5.0, ``timeSeriesHandling`` +determines the outcome. + +In mongosync 1.6, and MongoDB 6.0 and later, time series collections are +always ignored. + +In mongosync 1.7, and MongoDB 6.0 and later, time series collections are +always transferred. diff --git a/source/reference/configuration.txt b/source/reference/configuration.txt index bea9c0a9c..d3b8dd988 100644 --- a/source/reference/configuration.txt +++ b/source/reference/configuration.txt @@ -120,15 +120,6 @@ Options To set the ``port`` setting from the command line, see the :option:`--port` option. -.. setting:: skipTimeseriesHandling - - *Type*: string - - .. include:: /includes/opts/skipTimeseriesHandling - - To set the ``skipTimeseriesHandling`` setting from the command line, - see the :option:`--skipTimeseriesHandling` option. - .. setting:: verbosity *Type*: string diff --git a/source/reference/mongosync.txt b/source/reference/mongosync.txt index 39211d536..10eb37f21 100644 --- a/source/reference/mongosync.txt +++ b/source/reference/mongosync.txt @@ -119,9 +119,6 @@ Global Options .. include:: /includes/opts/skipTimeseriesHandling.rst - To set the ``--skipTimeseriesHandling`` option from a configuration - file, see the :setting:`skipTimeseriesHandling` setting. - .. option:: --verbosity .. |verbosity-opt-type| replace:: option diff --git a/source/release-notes/1.6.txt b/source/release-notes/1.6.txt index 81776aa48..4e6890574 100644 --- a/source/release-notes/1.6.txt +++ b/source/release-notes/1.6.txt @@ -58,6 +58,7 @@ For more information, see :ref:`c2c-filter-regex`. Starting in 1.6.0, ``mongosync`` supports sync with MongoDB 7.0. +<<<<<<< HEAD Other Notes ~~~~~~~~~~~ @@ -156,6 +157,14 @@ Issues Fixed: with non-simple collation during Mongosync initialization. We will investigate a more permanent solution for future releases. +======= +Time Series Collections +~~~~~~~~~~~~~~~~~~~~~~~ + +Starting in ``mongosync`` 1.6.0, time series collections are supported. + +For details., see the :option:`--skipTimeseriesHandling` option. +>>>>>>> 9df7dac... DOCSP-29501-time-series Minimum Supported Version ------------------------- diff --git a/source/release-notes/1.7.txt b/source/release-notes/1.7.txt index 1dc376487..5497ab9b2 100644 --- a/source/release-notes/1.7.txt +++ b/source/release-notes/1.7.txt @@ -39,6 +39,7 @@ New Features: - ``mongosync`` now truncates logged fields that contain more than 1,024 characters. +<<<<<<< HEAD Issues Fixed: - Fixed bug introduced in ``mongosync`` 1.5.0 that may cause ORR to insert @@ -52,6 +53,8 @@ Issues Fixed: initialization if the user specified only an exclusion filter and there were no fully excluded databases. +======= +>>>>>>> 9df7dac... DOCSP-29501-time-series Minimum Supported Version ------------------------- From 64937d0db07577082fe0dfbca12606a5e3d05305 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 13 Sep 2023 16:32:35 -0700 Subject: [PATCH 03/14] DOCSP-29501-time-series --- source/includes/time-series-collections.rst | 3 +++ source/reference/limitations.txt | 6 ++++++ source/release-notes/1.7.txt | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 source/includes/time-series-collections.rst diff --git a/source/includes/time-series-collections.rst b/source/includes/time-series-collections.rst new file mode 100644 index 000000000..1a405cc3e --- /dev/null +++ b/source/includes/time-series-collections.rst @@ -0,0 +1,3 @@ +In MongoDB 6.0 or later: time series collections are not transferred +in ``mongosync`` 1.6. Time series collections are always transferred +in ``mongosync` 1.7 and later. diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index 6c23e6ec5..c0cfaad8e 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -86,7 +86,13 @@ discuss your requirements. Unsupported Collection Types ---------------------------- +<<<<<<< HEAD - Time-series collections aren't supported. +======= +- In MongoDB 6.0 or later: time series collections are not transferred + in ``mongosync`` 1.6. (Time series collections are always transferred + in ``mongosync` 1.7 and later.) +>>>>>>> db71614... DOCSP-29501-time-series - Clustered collections with :ref:`expireAfterSeconds ` set aren't supported. diff --git a/source/release-notes/1.7.txt b/source/release-notes/1.7.txt index 5497ab9b2..1dc376487 100644 --- a/source/release-notes/1.7.txt +++ b/source/release-notes/1.7.txt @@ -39,7 +39,6 @@ New Features: - ``mongosync`` now truncates logged fields that contain more than 1,024 characters. -<<<<<<< HEAD Issues Fixed: - Fixed bug introduced in ``mongosync`` 1.5.0 that may cause ORR to insert @@ -53,8 +52,6 @@ Issues Fixed: initialization if the user specified only an exclusion filter and there were no fully excluded databases. -======= ->>>>>>> 9df7dac... DOCSP-29501-time-series Minimum Supported Version ------------------------- From 4fc1d6ac57abbfc2ac7d9f28dd05cb2576a5ef6b Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 13 Sep 2023 16:34:20 -0700 Subject: [PATCH 04/14] DOCSP-29501-time-series --- source/includes/opts/skipTimeseriesHandling.rst | 16 ---------------- source/reference/mongosync.txt | 4 ---- source/release-notes/1.6.txt | 10 ---------- 3 files changed, 30 deletions(-) delete mode 100644 source/includes/opts/skipTimeseriesHandling.rst diff --git a/source/includes/opts/skipTimeseriesHandling.rst b/source/includes/opts/skipTimeseriesHandling.rst deleted file mode 100644 index 145d7885c..000000000 --- a/source/includes/opts/skipTimeseriesHandling.rst +++ /dev/null @@ -1,16 +0,0 @@ -.. versionadded:: 1.6.0 - -Can be set to these strings: - -- ``abort``, which means ``mongosync`` ends if a time series collection - is found. -- ``skip``, which means ``mongosync`` ignores time series collections. - -In mongosync 1.6 and 1.7, and MongoDB 5.0, ``timeSeriesHandling`` -determines the outcome. - -In mongosync 1.6, and MongoDB 6.0 and later, time series collections are -always ignored. - -In mongosync 1.7, and MongoDB 6.0 and later, time series collections are -always transferred. diff --git a/source/reference/mongosync.txt b/source/reference/mongosync.txt index 10eb37f21..61fb33290 100644 --- a/source/reference/mongosync.txt +++ b/source/reference/mongosync.txt @@ -115,10 +115,6 @@ Global Options To set the ``--port`` option from a configuration file, see the :setting:`port` setting. -.. option:: --skipTimeseriesHandling - - .. include:: /includes/opts/skipTimeseriesHandling.rst - .. option:: --verbosity .. |verbosity-opt-type| replace:: option diff --git a/source/release-notes/1.6.txt b/source/release-notes/1.6.txt index 4e6890574..c0280c080 100644 --- a/source/release-notes/1.6.txt +++ b/source/release-notes/1.6.txt @@ -58,7 +58,6 @@ For more information, see :ref:`c2c-filter-regex`. Starting in 1.6.0, ``mongosync`` supports sync with MongoDB 7.0. -<<<<<<< HEAD Other Notes ~~~~~~~~~~~ @@ -157,17 +156,8 @@ Issues Fixed: with non-simple collation during Mongosync initialization. We will investigate a more permanent solution for future releases. -======= -Time Series Collections -~~~~~~~~~~~~~~~~~~~~~~~ - -Starting in ``mongosync`` 1.6.0, time series collections are supported. - -For details., see the :option:`--skipTimeseriesHandling` option. ->>>>>>> 9df7dac... DOCSP-29501-time-series Minimum Supported Version ------------------------- In 1.6, the minimum supported versions of MongoDB are 6.0.8 and 7.0.0. - From 98c9487757ac779eb812923ddf634cc5ee72b336 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 13 Sep 2023 16:40:10 -0700 Subject: [PATCH 05/14] DOCSP-29501-time-series --- source/reference/limitations.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index c0cfaad8e..6c23e6ec5 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -86,13 +86,7 @@ discuss your requirements. Unsupported Collection Types ---------------------------- -<<<<<<< HEAD - Time-series collections aren't supported. -======= -- In MongoDB 6.0 or later: time series collections are not transferred - in ``mongosync`` 1.6. (Time series collections are always transferred - in ``mongosync` 1.7 and later.) ->>>>>>> db71614... DOCSP-29501-time-series - Clustered collections with :ref:`expireAfterSeconds ` set aren't supported. From b6e6f87ac7946350d0f62f5486aa428b969cc66f Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 13 Sep 2023 16:40:56 -0700 Subject: [PATCH 06/14] DOCSP-29501-time-series --- source/includes/time-series-collections.rst | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 source/includes/time-series-collections.rst diff --git a/source/includes/time-series-collections.rst b/source/includes/time-series-collections.rst deleted file mode 100644 index 1a405cc3e..000000000 --- a/source/includes/time-series-collections.rst +++ /dev/null @@ -1,3 +0,0 @@ -In MongoDB 6.0 or later: time series collections are not transferred -in ``mongosync`` 1.6. Time series collections are always transferred -in ``mongosync` 1.7 and later. From 7d80addf56b3cd4ad0a6e291e6d44b09502e5a0c Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 13 Sep 2023 17:26:11 -0700 Subject: [PATCH 07/14] DOCSP-29501-time-series --- source/reference/limitations.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index 6c23e6ec5..74e5d4b9b 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -87,6 +87,11 @@ Unsupported Collection Types ---------------------------- - Time-series collections aren't supported. +- If you use ``mongosync`` 1.6 or earlier, time series collections are + not synchronized between clusters: the collection details are recorded + in the :ref:`log ` and the collections are skipped. If + you use ``mongosync`` 1.7 or later, time series collections are + synchronized between clusters. - Clustered collections with :ref:`expireAfterSeconds ` set aren't supported. From 9d0d9fdc7524fd484ef6a829cc8a16f3ddf8e1f2 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Thu, 14 Sep 2023 09:50:19 -0700 Subject: [PATCH 08/14] DOCSP-29501-time-series --- source/reference/limitations.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index 74e5d4b9b..e1cec20ac 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -86,12 +86,10 @@ discuss your requirements. Unsupported Collection Types ---------------------------- -- Time-series collections aren't supported. -- If you use ``mongosync`` 1.6 or earlier, time series collections are - not synchronized between clusters: the collection details are recorded - in the :ref:`log ` and the collections are skipped. If - you use ``mongosync`` 1.7 or later, time series collections are - synchronized between clusters. +- In ``mongosync`` 1.6 and earlier, time series collections do not + synchronize between clusters: MongoDB :ref:`logs ` the + collection details and skips those collections. In ``mongosync`` 1.7 + and later, time series collections are synchronized between clusters. - Clustered collections with :ref:`expireAfterSeconds ` set aren't supported. From 403e4199ef72fdd9d18e9d55b647709b28023d15 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Thu, 14 Sep 2023 11:14:26 -0700 Subject: [PATCH 09/14] DOCSP-29501-time-series --- source/release-notes/1.7.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/release-notes/1.7.txt b/source/release-notes/1.7.txt index 1dc376487..bb168e4b2 100644 --- a/source/release-notes/1.7.txt +++ b/source/release-notes/1.7.txt @@ -55,4 +55,4 @@ Issues Fixed: Minimum Supported Version ------------------------- -In 1.7.0, the minimum supported version of MongoDB is 6.0.8 and 7.0.0. +In 1.7.0, the minimum supported versions of MongoDB are 6.0.8 and 7.0.0. From 73f74a38dab4b2d5ce64dfd4c7c528d90d6645ef Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Thu, 14 Sep 2023 12:23:17 -0700 Subject: [PATCH 10/14] DOCSP-29501-time-series --- source/release-notes/1.7.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/release-notes/1.7.txt b/source/release-notes/1.7.txt index bb168e4b2..08a8d1640 100644 --- a/source/release-notes/1.7.txt +++ b/source/release-notes/1.7.txt @@ -55,4 +55,4 @@ Issues Fixed: Minimum Supported Version ------------------------- -In 1.7.0, the minimum supported versions of MongoDB are 6.0.8 and 7.0.0. +In 1.7.0, the minimum supported version of MongoDB is 6.0.8. From 8a4ca3e8ba1992d050b57aff61d2e660204c64a6 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 8 Nov 2023 14:13:40 -0800 Subject: [PATCH 11/14] DOCSP-29501-time-series --- source/release-notes/1.7.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/release-notes/1.7.txt b/source/release-notes/1.7.txt index 08a8d1640..1dc376487 100644 --- a/source/release-notes/1.7.txt +++ b/source/release-notes/1.7.txt @@ -55,4 +55,4 @@ Issues Fixed: Minimum Supported Version ------------------------- -In 1.7.0, the minimum supported version of MongoDB is 6.0.8. +In 1.7.0, the minimum supported version of MongoDB is 6.0.8 and 7.0.0. From 8f0afa0dc517edb8aa8a1f0f178d1c743b35cae4 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 8 Nov 2023 14:46:58 -0800 Subject: [PATCH 12/14] DOCSP-29501-time-series --- source/reference/limitations.txt | 4 ++-- source/release-notes/1.8.txt | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index e1cec20ac..678fcb6f7 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -86,9 +86,9 @@ discuss your requirements. Unsupported Collection Types ---------------------------- -- In ``mongosync`` 1.6 and earlier, time series collections do not +- In ``mongosync`` 1.7 and earlier, time series collections do not synchronize between clusters: MongoDB :ref:`logs ` the - collection details and skips those collections. In ``mongosync`` 1.7 + collection details and skips those collections. In ``mongosync`` 1.8 and later, time series collections are synchronized between clusters. - Clustered collections with :ref:`expireAfterSeconds ` set aren't supported. diff --git a/source/release-notes/1.8.txt b/source/release-notes/1.8.txt index a5539d2f9..ec7901ce6 100644 --- a/source/release-notes/1.8.txt +++ b/source/release-notes/1.8.txt @@ -23,6 +23,11 @@ Release Notes for mongosync 1.8 New Features: +Time Series Collections +~~~~~~~~~~~~~~~~~~~~~~~ + +Starting in ``mongosync`` 1.8.0, time series collections are +synchronized between clusters. Minimum Supported Version ------------------------- From 2fbdb9b4f25e1f3fd01d973bd17227b4db70b3db Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Wed, 8 Nov 2023 14:47:25 -0800 Subject: [PATCH 13/14] DOCSP-29501-time-series --- source/release-notes/1.6.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/source/release-notes/1.6.txt b/source/release-notes/1.6.txt index c0280c080..81776aa48 100644 --- a/source/release-notes/1.6.txt +++ b/source/release-notes/1.6.txt @@ -161,3 +161,4 @@ Minimum Supported Version ------------------------- In 1.6, the minimum supported versions of MongoDB are 6.0.8 and 7.0.0. + From f2d85bbe58b36b15b20617c11481e31817b72141 Mon Sep 17 00:00:00 2001 From: jason-price-mongodb Date: Thu, 9 Nov 2023 11:25:40 -0800 Subject: [PATCH 14/14] DOCSP-29501-time-series --- source/reference/limitations.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/reference/limitations.txt b/source/reference/limitations.txt index 678fcb6f7..82a614432 100644 --- a/source/reference/limitations.txt +++ b/source/reference/limitations.txt @@ -86,10 +86,9 @@ discuss your requirements. Unsupported Collection Types ---------------------------- -- In ``mongosync`` 1.7 and earlier, time series collections do not - synchronize between clusters: MongoDB :ref:`logs ` the - collection details and skips those collections. In ``mongosync`` 1.8 - and later, time series collections are synchronized between clusters. +- ``mongosync`` 1.7 and earlier don't support time-series collections. + Starting in ``mongosync`` 1.8, time series collections are + synchronized between clusters. - Clustered collections with :ref:`expireAfterSeconds ` set aren't supported.