Merge branch 'main' into refactoring/legacy_indices_read_only_compatible

javanna · Dec 19, 2024 · f943a25 · f943a25
2 parents 665fcff + 20a3492
commit f943a25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -298,6 +298,8 @@ tests:
   issue: https://github.com/elastic/elasticsearch/issues/116777
 - class: org.elasticsearch.xpack.security.authc.ldap.ActiveDirectoryRunAsIT
   issue: https://github.com/elastic/elasticsearch/issues/115727
+- class: org.elasticsearch.xpack.security.authc.kerberos.KerberosAuthenticationIT
+  issue: https://github.com/elastic/elasticsearch/issues/118414
 
 # Examples:
 #

diff --git a/server/src/test/java/org/elasticsearch/gateway/PersistedClusterStateServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/PersistedClusterStateServiceTests.java
@@ -54,7 +54,6 @@
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.env.BuildVersion;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.NodeEnvironment;
@@ -1392,7 +1391,7 @@ public void testLimitsFileCount() throws IOException {
         }
     }
 
-    public void testOverrideLuceneVersion() throws IOException {
+    public void testOverrideNodeVersion() throws IOException {
         try (NodeEnvironment nodeEnvironment = newNodeEnvironment(createDataPaths())) {
             final PersistedClusterStateService persistedClusterStateService = newPersistedClusterStateService(nodeEnvironment);
             final String clusterUUID = UUIDs.randomBase64UUID(random());
@@ -1415,9 +1414,7 @@ public void testOverrideLuceneVersion() throws IOException {
                 assertThat(clusterState.metadata().version(), equalTo(version));
 
             }
-            @UpdateForV9(owner = UpdateForV9.Owner.SEARCH_FOUNDATIONS)
             BuildVersion overrideVersion = BuildVersion.fromVersionId(Version.V_8_0_0.id);
-
             NodeMetadata prevMetadata = PersistedClusterStateService.nodeMetadata(persistedClusterStateService.getDataPaths());
             assertEquals(BuildVersion.current(), prevMetadata.nodeVersion());
             PersistedClusterStateService.overrideVersion(overrideVersion, persistedClusterStateService.getDataPaths());