Merge branch 'elastic:main' into Record-instead-of-Consumer<Releasable>

piergm · Nov 20, 2024 · feac22d · feac22d
2 parents f5492bf + 9854fdc
commit feac22d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 82 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -245,36 +245,6 @@ tests:
 - class: org.elasticsearch.xpack.test.rest.XPackRestIT
   method: test {p0=snapshot/10_basic/Failed to snapshot indices with synthetic source}
   issue: https://github.com/elastic/elasticsearch/issues/117082
-- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
-  method: testRollupIndex {cluster=OLD}
-  issue: https://github.com/elastic/elasticsearch/issues/117084
-- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
-  method: testRollupIndex {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/117086
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testNewReplicasTimeSeriesMode {cluster=OLD}
-  issue: https://github.com/elastic/elasticsearch/issues/117087
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testNewReplicasTimeSeriesMode {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/117088
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testSearchTimeSeriesMode {cluster=OLD}
-  issue: https://github.com/elastic/elasticsearch/issues/117089
-- class: org.elasticsearch.upgrades.FullClusterRestartIT
-  method: testSearchTimeSeriesMode {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/117090
-- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
-  method: testNewReplicasTimeSeriesMode {cluster=OLD}
-  issue: https://github.com/elastic/elasticsearch/issues/117091
-- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
-  method: testSearchTimeSeriesMode {cluster=OLD}
-  issue: https://github.com/elastic/elasticsearch/issues/117092
-- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
-  method: testNewReplicasTimeSeriesMode {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/117093
-- class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
-  method: testSearchTimeSeriesMode {cluster=UPGRADED}
-  issue: https://github.com/elastic/elasticsearch/issues/117094
 - class: org.elasticsearch.discovery.ClusterDisruptionIT
   method: testAckedIndexing
   issue: https://github.com/elastic/elasticsearch/issues/117024
@@ -305,6 +275,20 @@ tests:
 - class: org.elasticsearch.upgrades.IndexingIT
   method: testSyntheticSource {upgradedNodes=1}
   issue: https://github.com/elastic/elasticsearch/issues/117128
+- class: org.elasticsearch.upgrades.IndexingIT
+  method: testIndexing {upgradedNodes=3}
+  issue: https://github.com/elastic/elasticsearch/issues/117135
+- class: org.elasticsearch.upgrades.IndexingIT
+  method: testTsdb {upgradedNodes=3}
+  issue: https://github.com/elastic/elasticsearch/issues/117136
+- class: org.elasticsearch.upgrades.IndexingIT
+  method: testIndexing {upgradedNodes=2}
+  issue: https://github.com/elastic/elasticsearch/issues/117137
+- class: org.elasticsearch.upgrades.IndexingIT
+  method: testTsdb {upgradedNodes=2}
+  issue: https://github.com/elastic/elasticsearch/issues/117138
+- class: org.elasticsearch.upgrades.IndexingIT
+  issue: https://github.com/elastic/elasticsearch/issues/117140
 
 # Examples:
 #

diff --git a/...tart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java b/...tart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartDownsampleIT.java
@@ -268,6 +268,7 @@ private String getRollupIndexName() throws IOException {
     }
 
     public void testRollupIndex() throws Exception {
+        assumeTrue("Downsample got many stability improvements in 8.10.0", oldClusterHasFeature("gte_v8.10.0"));
         if (isRunningAgainstOldCluster()) {
             createIlmPolicy();
             createIndex();

diff --git a/...luster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/...luster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
@@ -261,6 +261,7 @@ public void testNewReplicas() throws Exception {
     }
 
     public void testSearchTimeSeriesMode() throws Exception {
+        assumeTrue("indexing time series indices changed in 8.2.0", oldClusterHasFeature("gte_v8.2.0"));
         int numDocs;
         if (isRunningAgainstOldCluster()) {
             numDocs = createTimeSeriesModeIndex(1);
@@ -298,6 +299,7 @@ public void testSearchTimeSeriesMode() throws Exception {
     }
 
     public void testNewReplicasTimeSeriesMode() throws Exception {
+        assumeTrue("indexing time series indices changed in 8.2.0", oldClusterHasFeature("gte_v8.2.0"));
         if (isRunningAgainstOldCluster()) {
             createTimeSeriesModeIndex(0);
         } else {

diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/ListenerActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/ListenerActionIT.java