Upgrade to ehCache 2.10.9.2 - #8051
Merged
Merged
Conversation
Contributor
|
Note: There is a newer, 3.x version that continues to be maintained, see: I'm fine taking this intermediate step (upgrading to the latest 2.x version). We should run many test suites on the change. Previous upgrades have caused problems, which is why we've stuck with an old version. |
labkey-adam
approved these changes
Sep 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rationale
After upgrading ehCache,
TargetedMSSkydTextIdTeststarted encountering errors inPrecursorChromatogramChartAction. ehCache version 2.6.11 seems to be more strict about having serializable cache keys. MakingLibrarySpectrumMatchGetter.PrecursorKeyexplicitly serializable fixes the error but there's a good chance we have other unserializable cache keys (e.g. org.labkey.api.data.SqlExecutingSelector.LargeResultWarning).The latest version of ehCache's 2.x line looks to have fixed
MemoryStore.evictto not impose this serializability restriction on cache keys.Stacktrace
The newer version of ehCache seems to have made their
CacheManagerthreadsafe, making ourSafeCacheManagerunnecessary.The cache leak detection in our
EhCacheProviderleverages classes and fields that no longer exist. Probably safe to remove the reflection-base monitoring.Related Pull Requests
Changes
EhSimpleCacheto work withehCacheAPI changesSafeCacheManagerCacheRejoinActionno longer exists)Tasks