Fix StatelessRealTimeTermVectorsIT

Author: lkts

muted-tests.yml

@@ -470,9 +470,6 @@ tests:
 - class: org.elasticsearch.search.aggregations.metrics.LargeTopHitsIT
   method: test500Queries
   issue: https://github.com/elastic/elasticsearch/issues/148056
-- class: org.elasticsearch.xpack.stateless.StatelessRealTimeTermVectorsIT
-  method: testUpdatedDocsNotInLiveVersionMapDoNotRefresh
-  issue: https://github.com/elastic/elasticsearch/issues/148067
 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
   method: test {p0=mtermvectors/10_basic/Tests catching other exceptions per item}
   issue: https://github.com/elastic/elasticsearch/issues/148096
@@ -488,9 +485,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.mixed.EsqlClientYamlIT
   method: test {p0=esql/50_index_patterns/_index LIKE with overly complex pattern}
   issue: https://github.com/elastic/elasticsearch/issues/148134
-- class: org.elasticsearch.xpack.stateless.StatelessRealTimeTermVectorsIT
-  method: testDocsNotInLiveVersionMapDoNotRefresh
-  issue: https://github.com/elastic/elasticsearch/issues/148138
 - class: org.elasticsearch.index.engine.LuceneChangesSnapshotTests
   method: testUpdateAndReadChangesConcurrently
   issue: https://github.com/elastic/elasticsearch/issues/148145

x-pack/plugin/stateless/src/internalClusterTest/java/org/elasticsearch/xpack/stateless/StatelessRealTimeTermVectorsIT.java

@@ -27,6 +27,8 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.stateless.engine.IndexEngine;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
@@ -168,7 +170,7 @@ public void doTestDocsInLiveVersionMapRefresh(TestDocsType testDocsType, boolean
 
         final int numDocs = randomIntBetween(1, 20);
         createIndexWithTermVectorMappings(1, 1);
-        indexTestDocuments(numDocs);
+        List<String> indexedDocumentIds = indexTestDocuments(numDocs);
 
         // If true, we test that the term vectors API will refresh appropriately depending on whether the second (not the first) version
         // of the updated documents is in the live version map (i.e., not yet searchable) of the indexing shard.
@@ -197,6 +199,8 @@ public void doTestDocsInLiveVersionMapRefresh(TestDocsType testDocsType, boolean
                 // No additional refreshes are expected in the test.
                 refresh(INDEX_NAME);
                 refresh(INDEX_NAME);
+                // Ensure that version map archive is empty since it is cleared asynchronously via `IndexEngine.commitSuccess()`.
+                assertDocumentNotInLiveVersionMapArchive(indexedDocumentIds.getLast());
             }
         }
 
@@ -236,14 +240,7 @@ public void doTestDocsInLiveVersionMapRefresh(TestDocsType testDocsType, boolean
                     // After the expected number of refreshes from the first docs, wait to ensure that the async
                     // IndexEngine.commitSuccess() has been called to move out the docs from the live version map archive.
                     // That way, the next term request should not do any other refreshes.
-                    assertBusy(() -> assertTrue(findIndexShard(INDEX_NAME).withEngine(e -> {
-                        assertThat(e, instanceOf(IndexEngine.class));
-                        final var indexEngine = (IndexEngine) e;
-                        final var archive = getArchive(indexEngine.getLiveVersionMap());
-                        assertNotNull(archive);
-                        assertNull(archive.get(uid(termVectorsResponse.getId())));
-                        return true;
-                    })));
+                    assertDocumentNotInLiveVersionMapArchive(termVectorsResponse.getId());
                 }
             }
         }
@@ -383,11 +380,17 @@ protected void createIndexWithTermVectorMappings(int shards, int replicas) throw
         );
     }
 
-    protected void indexTestDocuments(int numDocs) {
+    protected List<String> indexTestDocuments(int numDocs) {
+        var indexedDocumentIds = new ArrayList<String>();
+
         for (int i = 0; i < numDocs; i++) {
-            final var response = prepareIndex(INDEX_NAME).setId(String.valueOf(i)).setSource("field", "foo bar " + i).get();
+            String id = String.valueOf(i);
+            final var response = prepareIndex(INDEX_NAME).setId(id).setSource("field", "foo bar " + i).get();
             assertEquals(1, response.getVersion());
+            indexedDocumentIds.add(id);
         }
+
+        return indexedDocumentIds;
     }
 
     protected void updateTestDocuments(int numDocs) {
@@ -396,4 +399,15 @@ protected void updateTestDocuments(int numDocs) {
             assertEquals(2, response.getVersion());
         }
     }
+
+    private void assertDocumentNotInLiveVersionMapArchive(String documentId) throws Exception {
+        assertBusy(() -> assertTrue(findIndexShard(INDEX_NAME).withEngine(e -> {
+            assertThat(e, instanceOf(IndexEngine.class));
+            final var indexEngine = (IndexEngine) e;
+            final var archive = getArchive(indexEngine.getLiveVersionMap());
+            assertNotNull(archive);
+            assertNull(archive.get(uid(documentId)));
+            return true;
+        })));
+    }
 }