From 713e45626574a3835a2675e87566ac8811cd23cb Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Fri, 11 Dec 2020 10:19:07 -0500 Subject: [PATCH 1/5] Mention stats gatherer removal in notes about old configuration --- docs/historical/configuration.rst | 7 ++++++- newsfragments/3555.minor | 0 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 newsfragments/3555.minor diff --git a/docs/historical/configuration.rst b/docs/historical/configuration.rst index 7d9b9fbe4..1ad512883 100644 --- a/docs/historical/configuration.rst +++ b/docs/historical/configuration.rst @@ -23,7 +23,7 @@ Config setting File Comment ``BASEDIR/introducer.furl`` ``BASEDIR/private/introducers.yaml`` ``[client]helper.furl`` ``BASEDIR/helper.furl`` ``[client]key_generator.furl`` ``BASEDIR/key_generator.furl`` -``[client]stats_gatherer.furl`` ``BASEDIR/stats_gatherer.furl`` +``[client]stats_gatherer.furl`` ``BASEDIR/stats_gatherer.furl`` Stats gatherer has been removed. ``[storage]enabled`` ``BASEDIR/no_storage`` (``False`` if ``no_storage`` exists) ``[storage]readonly`` ``BASEDIR/readonly_storage`` (``True`` if ``readonly_storage`` exists) ``[storage]sizelimit`` ``BASEDIR/sizelimit`` @@ -47,3 +47,8 @@ the now (since Tahoe-LAFS v1.3.0) unsupported addresses specified in ``advertised_ip_addresses`` were used in addition to any that were automatically discovered), whereas the new ``tahoe.cfg`` directive is not (``tub.location`` is used verbatim). + +The stats gatherer has been broken at least since Tahoe-LAFS 1.13.0, +and has been removed. The functionality of +``[client].stats_gatherer.furl`` (which was previously in +``BASEDIR/stats_gatherer.furl``), is no longer available. diff --git a/newsfragments/3555.minor b/newsfragments/3555.minor new file mode 100644 index 000000000..e69de29bb From 94906bed1746eeca09dc6472b4d614bccab45dac Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Fri, 11 Dec 2020 10:32:41 -0500 Subject: [PATCH 2/5] Rewrite notes about stats gatherer removal --- docs/historical/configuration.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/historical/configuration.rst b/docs/historical/configuration.rst index 1ad512883..5f7a8725b 100644 --- a/docs/historical/configuration.rst +++ b/docs/historical/configuration.rst @@ -23,7 +23,7 @@ Config setting File Comment ``BASEDIR/introducer.furl`` ``BASEDIR/private/introducers.yaml`` ``[client]helper.furl`` ``BASEDIR/helper.furl`` ``[client]key_generator.furl`` ``BASEDIR/key_generator.furl`` -``[client]stats_gatherer.furl`` ``BASEDIR/stats_gatherer.furl`` Stats gatherer has been removed. + ``BASEDIR/stats_gatherer.furl`` Stats gatherer has been removed. ``[storage]enabled`` ``BASEDIR/no_storage`` (``False`` if ``no_storage`` exists) ``[storage]readonly`` ``BASEDIR/readonly_storage`` (``True`` if ``readonly_storage`` exists) ``[storage]sizelimit`` ``BASEDIR/sizelimit`` @@ -48,7 +48,7 @@ addresses specified in ``advertised_ip_addresses`` were used in addition to any that were automatically discovered), whereas the new ``tahoe.cfg`` directive is not (``tub.location`` is used verbatim). -The stats gatherer has been broken at least since Tahoe-LAFS 1.13.0, -and has been removed. The functionality of -``[client].stats_gatherer.furl`` (which was previously in -``BASEDIR/stats_gatherer.furl``), is no longer available. +The stats gatherer has been broken at least since Tahoe-LAFS 1.13.0. +The functionality of ``[client].stats_gatherer.furl`` (which was +previously in ``BASEDIR/stats_gatherer.furl``), will not be available +after Tahoe-LAFS v1.15.0 rc0. From 0e02f0cd85f543d5fa9aa1e938961755f093cf85 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Fri, 11 Dec 2020 11:19:27 -0500 Subject: [PATCH 3/5] Remove extra "." --- docs/historical/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/historical/configuration.rst b/docs/historical/configuration.rst index 5f7a8725b..de71ffd38 100644 --- a/docs/historical/configuration.rst +++ b/docs/historical/configuration.rst @@ -49,6 +49,6 @@ addition to any that were automatically discovered), whereas the new ``tahoe.cfg`` directive is not (``tub.location`` is used verbatim). The stats gatherer has been broken at least since Tahoe-LAFS 1.13.0. -The functionality of ``[client].stats_gatherer.furl`` (which was +The functionality of ``[client]stats_gatherer.furl`` (which was previously in ``BASEDIR/stats_gatherer.furl``), will not be available after Tahoe-LAFS v1.15.0 rc0. From da3d5e9f6c7d1b002c71f590378c9fc2f21331c2 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Fri, 11 Dec 2020 11:26:31 -0500 Subject: [PATCH 4/5] Update note about stats gatherer removal --- docs/historical/configuration.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/historical/configuration.rst b/docs/historical/configuration.rst index de71ffd38..a31e4897c 100644 --- a/docs/historical/configuration.rst +++ b/docs/historical/configuration.rst @@ -49,6 +49,8 @@ addition to any that were automatically discovered), whereas the new ``tahoe.cfg`` directive is not (``tub.location`` is used verbatim). The stats gatherer has been broken at least since Tahoe-LAFS 1.13.0. -The functionality of ``[client]stats_gatherer.furl`` (which was -previously in ``BASEDIR/stats_gatherer.furl``), will not be available -after Tahoe-LAFS v1.15.0 rc0. +The (broken) functionality of ``[client]stats_gatherer.furl`` (which +was previously in ``BASEDIR/stats_gatherer.furl``), is scheduled to be +completely removed after Tahoe-LAFS v1.15.0. After that point, if +your configuration contains a ``[client]stats_gatherer.furl``, your +node will refuse to start. From a0479a52e39b7b17919741177c574122a8e44130 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Fri, 11 Dec 2020 11:30:03 -0500 Subject: [PATCH 5/5] Be consistent when mentioning versions --- docs/historical/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/historical/configuration.rst b/docs/historical/configuration.rst index a31e4897c..867ed0de0 100644 --- a/docs/historical/configuration.rst +++ b/docs/historical/configuration.rst @@ -48,7 +48,7 @@ addresses specified in ``advertised_ip_addresses`` were used in addition to any that were automatically discovered), whereas the new ``tahoe.cfg`` directive is not (``tub.location`` is used verbatim). -The stats gatherer has been broken at least since Tahoe-LAFS 1.13.0. +The stats gatherer has been broken at least since Tahoe-LAFS v1.13.0. The (broken) functionality of ``[client]stats_gatherer.furl`` (which was previously in ``BASEDIR/stats_gatherer.furl``), is scheduled to be completely removed after Tahoe-LAFS v1.15.0. After that point, if