[Test] Account for auto-repairing for shard gen file (elastic#112778)

Since elastic#112337, missing shard gen files are automatically reconstructed based on the existing shard snapshot files. If the list of shard snapshot files is complete, it means the repository is effectively not corrupted. This PR updates the test to account for this situation. Resolves: elastic#112769
ywangd · Sep 12, 2024 · e1f7814 · e1f7814
1 parent e22bef6
commit e1f7814
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -208,9 +208,6 @@ tests:
 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
   method: test {yaml=reference/cluster/stats/line_1450}
   issue: https://github.com/elastic/elasticsearch/issues/112732
-- class: org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT
-  method: testCorruption
-  issue: https://github.com/elastic/elasticsearch/issues/112769
 - class: org.elasticsearch.script.StatsSummaryTests
   method: testEqualsAndHashCode
   issue: https://github.com/elastic/elasticsearch/issues/112439

diff --git a/...g/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityIT.java b/...g/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityIT.java
@@ -344,16 +344,23 @@ public void testCorruption() throws IOException {
                 ? equalTo(testContext.indexNames().size())
                 : lessThan(testContext.indexNames().size())
         );
-        assertThat(anomalies, not(empty()));
+        // Missing shard generation file is automatically repaired based on the shard snapshot files.
+        // See also BlobStoreRepository#buildBlobStoreIndexShardSnapshots
+        final boolean deletedShardGen = corruptedFileType == RepositoryFileType.SHARD_GENERATION && Files.exists(corruptedFile) == false;
+        assertThat(anomalies, deletedShardGen ? empty() : not(empty()));
         assertThat(responseObjectPath.evaluate("results.total_anomalies"), greaterThanOrEqualTo(anomalies.size()));
-        assertEquals("fail", responseObjectPath.evaluate("results.result"));
+        assertEquals(deletedShardGen ? "pass" : "fail", responseObjectPath.evaluate("results.result"));
 
         // remove permitted/expected anomalies to verify that no unexpected ones were seen
         switch (corruptedFileType) {
             case SNAPSHOT_INFO -> anomalies.remove("failed to load snapshot info");
             case GLOBAL_METADATA -> anomalies.remove("failed to load global metadata");
             case INDEX_METADATA -> anomalies.remove("failed to load index metadata");
-            case SHARD_GENERATION -> anomalies.remove("failed to load shard generation");
+            case SHARD_GENERATION -> {
+                if (deletedShardGen == false) {
+                    anomalies.remove("failed to load shard generation");
+                }
+            }
             case SHARD_SNAPSHOT_INFO -> anomalies.remove("failed to load shard snapshot");
             case SHARD_DATA -> {
                 anomalies.remove("missing blob");