From b4e852a54be436d8b8036da0a0ec4a472d44524a Mon Sep 17 00:00:00 2001
From: Andrei Dan <andrei.dan@elastic.co>
Date: Mon, 9 Dec 2024 12:00:12 +0100
Subject: [PATCH] [TEST] Wait for no pending operations on the index shard
 (#118244)

This fixes testRetryPointInTime which on teardown is looking to assert
that the operations in the translog and in the lucene index are the
same.

Previously we didn't wait for the translog operations to be applied.
This changes `assertConsistentHistoryInLuceneIndex` to wait for the
pending operations in the translog to be applied.

Fixes #117116
---
 muted-tests.yml                                                | 3 ---
 .../elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index 4523db7239be6..dcaa415a67966 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -157,9 +157,6 @@ tests:
 - class: org.elasticsearch.xpack.test.rest.XPackRestIT
   method: test {p0=snapshot/10_basic/Create a source only snapshot and then restore it}
   issue: https://github.com/elastic/elasticsearch/issues/117295
-- class: org.elasticsearch.xpack.searchablesnapshots.RetrySearchIntegTests
-  method: testRetryPointInTime
-  issue: https://github.com/elastic/elasticsearch/issues/117116
 - class: org.elasticsearch.xpack.inference.DefaultEndPointsIT
   method: testInferDeploysDefaultElser
   issue: https://github.com/elastic/elasticsearch/issues/114913
diff --git a/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java
index 8bc81fef2157d..a2bf70bf6e087 100644
--- a/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java
@@ -128,6 +128,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
 
     @After
     public void assertConsistentHistoryInLuceneIndex() throws Exception {
+        internalCluster().beforeIndexDeletion();
         internalCluster().assertConsistentHistoryBetweenTranslogAndLuceneIndex();
     }