From 5c4e7a4d788cfe9995acc1fc8855321e3b834f05 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 30 Jun 2025 16:22:47 -0700 Subject: [PATCH 1/4] update helm chart versions --- helm/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 04b7f8fc7..f558c3365 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -21,8 +21,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: "2.1.2-SNAPSHOT" -icon: https://camo.githubusercontent.com/a41e704e6cbd198afed0a892f2dccfc43aef29fb7631407048f531aa31956e72/68747470733a2f2f6b6e622e65636f696e666f726d61746963732e6f72672f6b6e622f646f63732f5f696d616765732f6d6574616361742d6c6f676f2d6461726b677261792e706e67 +version: "2.1.2" +icon: https://github.com/NCEAS/metacat/blob/develop/docs/dev/images/metacat-logo.png # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -30,7 +30,7 @@ icon: https://camo.githubusercontent.com/a41e704e6cbd198afed0a892f2dccfc43aef29f # It is recommended to use it with quotes. # NOTE that the chart will pull the docker image whose tag matches this value, if 'image.tag' is # not set in values.yaml -appVersion: "3.2.2-SNAPSHOT" +appVersion: "3.2.2" # Chart dependencies - also see https://github.com/bitnami/charts/tree/main/bitnami dependencies: From 92562381fa1becb39d07795343590b0a3bcd3042 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 1 Jul 2025 08:11:50 -0700 Subject: [PATCH 2/4] WIP: release notes --- RELEASE-NOTES.md | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) mode change 100755 => 100644 RELEASE-NOTES.md diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md old mode 100755 new mode 100644 index 35be0fc05..5f2ad9095 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,5 +1,40 @@ # Metacat Release Notes +> [!CAUTION] +> If you are upgrading from a helm chart version earlier than 2.1.0, please see the [Upgrade +> Notes](#chart-upgrade-notes) below. Failure to do so may result in loss of data! + +## Release Notes for Metacat 3.2.2 + +**Release date: 2025- TODO ** + + + +### Version Upgrades and Bug Fixes: + +- Fixed: Bug: Large Bagit Archive Downloads Broken on Safari/Bagit setting incorrect Content-Type ([Issue #2175](https://github.com/NCEAS/metacat/issues/2175)) +- Fixed: Metacat DataONE admin page doesn't show the error message from CN ([Issue #2040](https://github.com/NCEAS/metacat/issues/2040)) +- Fixed: Hashstore convertor may miss some objects which need to be converted ([Issue #2182](https://github.com/NCEAS/metacat/issues/2182)) +- Update `eml2osti.xsl` for OSTI Service ([Issue #2185](https://github.com/NCEAS/metacat/issues/2185)), to incorporate bug fix for [OSTI XML Sponsor List starting with semicolon causes error in OSTI submission](https://github.com/ess-dive/essdive-toolset/issues/368) +- Upgrade Postgres from 42.7.4 to 42.7.7 ([issue #2191](https://github.com/NCEAS/metacat/issues/2191)) +- Upgrade DataONE-Indexer library to 3.1.5 in metacat-index (see [dataone-indexer Release Notes](https://github.com/DataONEorg/dataone-indexer/blob/main/RELEASE-NOTES.md#dataone-indexer-version-315--helm-chart-version-132) fro details) + +### Other Enhancements: + +- Ensure Metacat Startup Doesn't Fail if CN Registration Unsuccessful ([Issue #2181](https://github.com/NCEAS/metacat/issues/2181)) +- Utility Scripts for Metacat Administrators: + - (Python) submit index tasks as low priority in the background, given a list of object IDs (PIDs) ([Issue #2176](https://github.com/NCEAS/metacat/issues/2176)) + - (Python) Synchronize the system metadata of a list of object IDs (PIDs) from Metacat database to the corresponding files in HashStore ([Issue #2166](https://github.com/NCEAS/metacat/issues/2166)) + - (Bash) Determine the subset of objects that have not been indexed, and submit them for indexing ([Issue #2165](https://github.com/NCEAS/metacat/issues/2165)) + +## Release Notes for helm chart 2.1.2 + +**Release date: 2025- TODO ** + +- Bump dataone-indexer sub-chart to version 1.3.2 ([see indexer release notes for + details](https://github.com/DataONEorg/dataone-indexer/blob/3.1.5/RELEASE-NOTES.md)) + + ## Release Notes for helm chart 2.1.1 **Release date: 2025-05-20** @@ -20,7 +55,7 @@ listed below. ## Release Notes for Metacat 3.2.1 -**Release date: 2024-05-01** +**Release date: 2025-05-01** ### Version Upgrades and Bug Fixes: - Fixed [Auto-restart Hashstore Conversion if Interrupted](https://github.com/NCEAS/metacat/issues/2123) From 758d6dd5f7ddcd6e58ab1fb313d504f78ac19020 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 1 Jul 2025 16:42:13 -0700 Subject: [PATCH 3/4] idx resourcemapMaxTries: 200 --- helm/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/helm/values.yaml b/helm/values.yaml index 018de2d07..7a609c736 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1184,6 +1184,12 @@ dataone-indexer: ## subPath: *sharedVolumeSubPath + idxworker: + ## temp fix for resourcemaps not getting indexed + ## keep default for: resourcemapWaitMs: 800 + ## increase number of tries from 25 to: + resourcemapMaxTries: 200 + rabbitmq: ## @param dataone-indexer.rabbitmq.extraConfiguration extra config, to be appended to rmq config ## Default consumer_timeout is 30 mins (i.e. 18000000mS). Increase this to 1hr to avoid timeouts From de74a6971f8a14f0d121cf55fa6d704d9e9f9a31 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 1 Jul 2025 16:57:07 -0700 Subject: [PATCH 4/4] release note edits --- RELEASE-NOTES.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 5f2ad9095..2f96a1209 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -6,22 +6,21 @@ ## Release Notes for Metacat 3.2.2 -**Release date: 2025- TODO ** - - +**Release date: 2025-07-02 ** ### Version Upgrades and Bug Fixes: -- Fixed: Bug: Large Bagit Archive Downloads Broken on Safari/Bagit setting incorrect Content-Type ([Issue #2175](https://github.com/NCEAS/metacat/issues/2175)) +- Fixed: Bug: Bagit setting incorrect Content-Type ([Issue #1953](https://github.com/NCEAS/metacat/issues/1953)) - Fixed: Metacat DataONE admin page doesn't show the error message from CN ([Issue #2040](https://github.com/NCEAS/metacat/issues/2040)) - Fixed: Hashstore convertor may miss some objects which need to be converted ([Issue #2182](https://github.com/NCEAS/metacat/issues/2182)) - Update `eml2osti.xsl` for OSTI Service ([Issue #2185](https://github.com/NCEAS/metacat/issues/2185)), to incorporate bug fix for [OSTI XML Sponsor List starting with semicolon causes error in OSTI submission](https://github.com/ess-dive/essdive-toolset/issues/368) - Upgrade Postgres from 42.7.4 to 42.7.7 ([issue #2191](https://github.com/NCEAS/metacat/issues/2191)) -- Upgrade DataONE-Indexer library to 3.1.5 in metacat-index (see [dataone-indexer Release Notes](https://github.com/DataONEorg/dataone-indexer/blob/main/RELEASE-NOTES.md#dataone-indexer-version-315--helm-chart-version-132) fro details) +- Upgrade DataONE-Indexer library to 3.1.5 in metacat-index (see [dataone-indexer Release Notes](https://github.com/DataONEorg/dataone-indexer/blob/main/RELEASE-NOTES.md#dataone-indexer-version-315--helm-chart-version-132) for details) ### Other Enhancements: - Ensure Metacat Startup Doesn't Fail if CN Registration Unsuccessful ([Issue #2181](https://github.com/NCEAS/metacat/issues/2181)) +- Increase `index.resourcemap.waitingComponent.max.attempts` to 200 as a temporary fix for resourcemaps not being successfully indexed - Utility Scripts for Metacat Administrators: - (Python) submit index tasks as low priority in the background, given a list of object IDs (PIDs) ([Issue #2176](https://github.com/NCEAS/metacat/issues/2176)) - (Python) Synchronize the system metadata of a list of object IDs (PIDs) from Metacat database to the corresponding files in HashStore ([Issue #2166](https://github.com/NCEAS/metacat/issues/2166)) @@ -29,10 +28,12 @@ ## Release Notes for helm chart 2.1.2 -**Release date: 2025- TODO ** +**Release date: 2025-07-02 ** - Bump dataone-indexer sub-chart to version 1.3.2 ([see indexer release notes for details](https://github.com/DataONEorg/dataone-indexer/blob/3.1.5/RELEASE-NOTES.md)) +- Set [additional Ingress annotations](https://github.com/NCEAS/metacat/commit/80aa42ad) for enabling upload and download of large files and data packages, without timeouts/disconnects. +- Increase `.Values.dataone-indexer.idxworker.resourcemapMaxTries` to 200 as a temporary fix for resourcemaps not being successfully indexed. ## Release Notes for helm chart 2.1.1