Store: keep IndexFormatTooOldException and IndexFormatTooNewException in corruption marker (#33920)

Closes #33916

Author: vladimirdolzhenko

server/src/main/java/org/elasticsearch/index/store/Store.java

@@ -185,7 +185,7 @@ public SegmentInfos readLastCommittedSegmentsInfo() throws IOException {
         failIfCorrupted();
         try {
             return readSegmentsInfo(null, directory());
-        } catch (CorruptIndexException ex) {
+        } catch (CorruptIndexException | IndexFormatTooOldException | IndexFormatTooNewException ex) {
             markStoreCorrupted(ex);
             throw ex;
         }

server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java

@@ -146,7 +146,6 @@ public void testShardLock() throws Exception {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33916")
     public void testCorruptedIndex() throws Exception {
         final int numDocs = indexDocs(indexShard, true);
 
@@ -179,10 +178,10 @@ public void testCorruptedIndex() throws Exception {
             } else {
                 assertThat(e.getMessage(), containsString("aborted by user"));
             }
+        } finally {
+            logger.info("--> output:\n{}", t.getOutput());
         }
 
-        logger.info("--> output:\n{}", t.getOutput());
-
         if (corruptSegments == false) {
 
             // run command without dry-run