Skip to content

Make CacheService.get() throws AlreadyClosedException when service is stopped #122006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlrx merged 3 commits into from
Feb 10, 2025
Merged

Make CacheService.get() throws AlreadyClosedException when service is stopped #122006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a946e4
Make CacheService.get() throws AlreadyClosedException when service is…
tlrx Feb 7, 2025
7bf0d54
Merge branch 'main' into 2025/02/07/fix-121927
tlrx Feb 10, 2025
a02da28
unmute
tlrx Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,6 @@ tests:
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
method: test {yaml=reference/cat/health/cat-health-no-timestamp-example}
issue: https://github.com/elastic/elasticsearch/issues/121867
- class: org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests
method: testCreateAndRestorePartialSearchableSnapshot
issue: https://github.com/elastic/elasticsearch/issues/121927
- class: org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT
method: test {yaml=analysis-common/40_token_filters/stemmer_override file access}
issue: https://github.com/elastic/elasticsearch/issues/121625
Expand Down
6 changes: 5 additions & 1 deletion ...ts/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,11 @@ private void ensureLifecycleStarted() {
final Lifecycle.State state = lifecycleState();
assert state != Lifecycle.State.INITIALIZED : state;
if (state != Lifecycle.State.STARTED) {
throw new IllegalStateException("Failed to read data from cache: cache service is not started [" + state + "]");
if (state == Lifecycle.State.STOPPED) {
throw new AlreadyClosedException("Failed to read data from cache: cache service is stopped");
} else {
throw new IllegalStateException("Failed to read data from cache: cache service is not started [" + state + "]");
}
}
}

Expand Down