Unmute `FrozenSearchableSnapshotsIntegTests#testCreateAndRestoreParti…

…alSearchableSnapshot` (#122831) * Unmute `FrozenSearchableSnapshotsIntegTests#testCreateAndRestorePartialSearchableSnapshot` The underlying failure `java.lang.AssertionError: Searchable snapshot directory does not support the operation [createOutput` was fixed in #122006. The automation bot was too aggressive in re-opening this issue. Resolve #122693 * Add a check for the CLOSED state along with STOPPED * Update x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java Co-authored-by: Tanguy Leroux <[email protected]> --------- Co-authored-by: Tanguy Leroux <[email protected]>
elastic · Feb 18, 2025 · b4e95dc · b4e95dc
1 parent 45f0471
commit b4e95dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -315,9 +315,6 @@ tests:
 - class: org.elasticsearch.xpack.autoscaling.storage.ReactiveStorageIT
   method: testScaleWhileShrinking
   issue: https://github.com/elastic/elasticsearch/issues/122119
-- class: org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests
-  method: testCreateAndRestorePartialSearchableSnapshot
-  issue: https://github.com/elastic/elasticsearch/issues/122693
 - class: org.elasticsearch.search.basic.SearchWithRandomDisconnectsIT
   method: testSearchWithRandomDisconnects
   issue: https://github.com/elastic/elasticsearch/issues/122707

diff --git a/...ts/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java b/...ts/src/main/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/CacheService.java
@@ -245,8 +245,8 @@ private void ensureLifecycleStarted() {
         final Lifecycle.State state = lifecycleState();
         assert state != Lifecycle.State.INITIALIZED : state;
         if (state != Lifecycle.State.STARTED) {
-            if (state == Lifecycle.State.STOPPED) {
-                throw new AlreadyClosedException("Failed to read data from cache: cache service is stopped");
+            if (state == Lifecycle.State.STOPPED || state == Lifecycle.State.CLOSED) {
+                throw new AlreadyClosedException("Failed to read data from cache: cache service is [" + state + ']');
             } else {
                 throw new IllegalStateException("Failed to read data from cache: cache service is not started [" + state + "]");
             }