[Fixes #14097] Label thesaurus is not reloaded on thesaurus changes by etj · Pull Request #14098 · GeoNode/geonode

etj · 2026-04-03T16:29:15Z

Updates GeoNode's i18n caching logic so that changes to the labels-i18n Thesaurus reliably invalidate previously cached localized label data (and related i18n-derived caches) instead of continuing to serve stale values.

Changes Made

Cache invalidation: When the Thesaurus date changes, the entire in-memory lang_cache is cleared (all languages) rather than only invalidating the current (lang, data_key) lookup, ensuring no stale data is served for any language.
Thread safety: All lang_cache mutations (set(), clear(), force_check()) are now guarded with _lock, making cache invalidation atomic across concurrent readers and writers. The DB query in set() is kept outside the lock to avoid holding it during I/O.
Regression test: Added test_stale_cache_invalidated_on_thesaurus_update in geonode/metadata/tests/test_i18n.py to reproduce the stale-cache scenario — it warms up the cache for multiple languages (en and it), bumps the Thesaurus date, and asserts that all language caches are rebuilt with fresh values.

Copilot

Pull request overview

This PR updates GeoNode’s i18n caching logic so that changes to the labels-i18n Thesaurus reliably invalidate previously cached localized label data (and related i18n-derived caches) instead of continuing to serve stale values.

Changes:

When the Thesaurus date changes, invalidate cached i18n data by clearing the in-memory cache rather than only invalidating the current (lang, data_key) lookup.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-03T16:32:23Z

                if cached_entry and cached_entry.date != thesaurus_date:
-                    logger.info(f"Cache for {lang}:{data_key} needs to be recreated")
+                    logger.info(f"Cache for {lang}:{data_key} dirty, clearing all caches")
+                    self.lang_cache.clear()
                    return thesaurus_date, None


get_entry() now clears self.lang_cache under _lock, but set() and clear() mutate self.lang_cache without acquiring the same lock. This creates a real race where one thread can be in setdefault()/write while another thread clears the dict, leading to lost updates and inconsistent cache state. Consider guarding all lang_cache mutations (set(), clear(), force_check()) with _lock (or switching to a thread-safe strategy) so invalidation is atomic across readers/writers.

@copilot apply changes based on this feedback

Applied in commit a2745f9. All lang_cache mutations (set(), clear(), force_check()) are now guarded with _lock. The DB query in set() is intentionally kept outside the lock to avoid holding it during I/O, with only the actual cache mutations inside the lock context.

Copilot · 2026-04-03T16:32:23Z

                if cached_entry and cached_entry.date != thesaurus_date:
-                    logger.info(f"Cache for {lang}:{data_key} needs to be recreated")
+                    logger.info(f"Cache for {lang}:{data_key} dirty, clearing all caches")
+                    self.lang_cache.clear()
                    return thesaurus_date, None


The new behavior invalidates the entire i18n cache when the Thesaurus date changes. Given this is a regression fix (and i18nCache is also used for other cached data like metadata schema), it would be good to add a unit test that reproduces the stale-cache scenario and asserts that previously cached values (e.g., schema and/or labels for multiple languages) are rebuilt after a Thesaurus update.

@copilot apply changes based on this feedback

Added in commit d6add25. The new test test_stale_cache_invalidated_on_thesaurus_update in geonode/metadata/tests/test_i18n.py:

Warms up the cache with labels for both en and it

Updates the label values in the DB and bumps the Thesaurus date (simulating a real thesaurus update)

Forces a freshness check (bypassing CHECK_INTERVAL)

Asserts that both language caches are rebuilt with the new values, not the stale ones

gemini-code-assist

Code Review

This pull request updates the cache invalidation logic in geonode/base/i18n.py by clearing the entire language cache when a dirty cache entry is detected. I have no further feedback to provide.

Agent-Logs-Url: https://github.com/GeoNode/geonode/sessions/26a81ebe-aef6-4850-b356-885f6bdce0dc Co-authored-by: etj <717359+etj@users.noreply.github.com>

cla-bot · 2026-04-03T16:45:20Z

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have the users @Copilot on file. In order for us to review and merge your code, please contact the project maintainers to get yourself added.

Agent-Logs-Url: https://github.com/GeoNode/geonode/sessions/cbf02dc8-5fb7-402a-9ab5-9f58f1a5378e Co-authored-by: etj <717359+etj@users.noreply.github.com>

cla-bot · 2026-04-03T16:53:56Z

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have the users @Copilot on file. In order for us to review and merge your code, please contact the project maintainers to get yourself added.

etj · 2026-04-07T10:20:19Z

@copilot apply black formatting

Agent-Logs-Url: https://github.com/GeoNode/geonode/sessions/73015399-e501-43f4-8387-7807b3257567 Co-authored-by: etj <717359+etj@users.noreply.github.com>

cla-bot · 2026-04-07T10:21:24Z

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have the users @Copilot on file. In order for us to review and merge your code, please contact the project maintainers to get yourself added.

Copilot · 2026-04-07T10:21:27Z

@copilot apply black formatting

Done in commit d87d0cf. i18n.py was already black-compliant; test_i18n.py had one block reformatted.

…format * commit 'f8e9fb4585129ad4e028ede61e55e468575207c2': (34 commits) Fix formatting Merge commit from fork [Fixes GeoNode#13939] Add support for non-spatial datasets in CSV format in GeoNode (GeoNode#13900) build(deps): bump cryptography from 46.0.5 to 46.0.7 (GeoNode#14116) Add resourcehandlerinfo creation management command (GeoNode#14118) build(deps): update jwcrypto requirement from >=1.5.6 to >=1.5.7 (GeoNode#14127) build(deps-dev): update pip requirement from >=19.1 to >=26.0.1 (GeoNode#14125) [Fixes GeoNode#14095] Upload thumbnails through the UI for the remote spatial datasets (GeoNode#14096) build(deps): bump python-calamine from 0.6.1 to 0.6.2 (GeoNode#14102) build(deps): bump django from 5.2.12 to 5.2.13 (GeoNode#14115) [Fixes GeoNode#14111] Fix Harvester lookup failure caused by trailing ? during the remote resource upload through the API (GeoNode#14112) updated folder for RTD [Fixes GeoNode#14097] Label thesaurus is not reloaded on thesaurus changes (GeoNode#14098) [Fixes GeoNode#14109] Fixes Dataset creation from JSON Schema fails for LineString (GeoNode#14110) Renamed docs folder [Fixes GeoNode#14035] Implementation of a common ResourceManager base class for all resource types (GeoNode#14053) moving the example in the end of this section adding docs for the social account group sync [Fixes GeoNode#14042] deprecate overwrite_existing_layers in favor of action… (GeoNode#14043) [Fixes GeoNode#13936] Support for XLSX File Uploads in GeoNode (GeoNode#13937) ...

[Fixes #14097] Label thesaurus is not reloaded on thesaurus changes

fe1845b

etj added this to the 5.1.0 milestone Apr 3, 2026

etj requested a review from mattiagiupponi April 3, 2026 16:29

etj self-assigned this Apr 3, 2026

Copilot AI review requested due to automatic review settings April 3, 2026 16:29

etj added the bug label Apr 3, 2026

cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Apr 3, 2026

Copilot started reviewing on behalf of etj April 3, 2026 16:29 View session

etj linked an issue Apr 3, 2026 that may be closed by this pull request

Label thesaurus is not reloaded on thesaurus changes #14097

Closed

Copilot AI reviewed Apr 3, 2026

View reviewed changes

gemini-code-assist bot reviewed Apr 3, 2026

View reviewed changes

Copilot started work on behalf of etj April 3, 2026 16:43 View session

Fix thread safety: guard set(), clear(), force_check() with _lock

a2745f9

Agent-Logs-Url: https://github.com/GeoNode/geonode/sessions/26a81ebe-aef6-4850-b356-885f6bdce0dc Co-authored-by: etj <717359+etj@users.noreply.github.com>

cla-bot bot removed the cla-signed CLA Bot: community license agreement signed label Apr 3, 2026

Copilot finished work on behalf of etj April 3, 2026 16:47

Copilot started work on behalf of etj April 3, 2026 16:51 View session

Add test for stale cache invalidation on thesaurus update

d6add25

Agent-Logs-Url: https://github.com/GeoNode/geonode/sessions/cbf02dc8-5fb7-402a-9ab5-9f58f1a5378e Co-authored-by: etj <717359+etj@users.noreply.github.com>

Copilot finished work on behalf of etj April 3, 2026 16:55

Copilot started work on behalf of etj April 7, 2026 10:20 View session

Apply black formatting to test_i18n.py

d87d0cf

Agent-Logs-Url: https://github.com/GeoNode/geonode/sessions/73015399-e501-43f4-8387-7807b3257567 Co-authored-by: etj <717359+etj@users.noreply.github.com>

Copilot finished work on behalf of etj April 7, 2026 10:22

mattiagiupponi approved these changes Apr 7, 2026

View reviewed changes

etj merged commit 4209a8c into master Apr 7, 2026
15 of 16 checks passed

etj deleted the 14097_i18n_reload branch April 7, 2026 14:09

Conversation

etj commented Apr 3, 2026 • edited by Copilot AI Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Made

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

etj Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

etj Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

cla-bot bot commented Apr 3, 2026

Uh oh!

cla-bot bot commented Apr 3, 2026

Uh oh!

etj commented Apr 7, 2026

Uh oh!

cla-bot bot commented Apr 7, 2026

Uh oh!

Copilot AI commented Apr 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

etj commented Apr 3, 2026 •

edited by Copilot AI

Loading