Merge branch 'main' into maximum-timestamp-in-get-data-streams

dakrone · Aug 28, 2024 · a18b3c3 · a18b3c3
2 parents 2593151 + 56a1ae5
commit a18b3c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -166,6 +166,12 @@ tests:
 - class: org.elasticsearch.search.query.ScriptScoreQueryTests
   method: testScriptTermStatsNotAvailable
   issue: https://github.com/elastic/elasticsearch/issues/112290
+- class: org.elasticsearch.search.retriever.rankdoc.RankDocsSortBuilderTests
+  method: testEqualsAndHashcode
+  issue: https://github.com/elastic/elasticsearch/issues/112312
+- class: org.elasticsearch.blobcache.shared.SharedBlobCacheServiceTests
+  method: testGetMultiThreaded
+  issue: https://github.com/elastic/elasticsearch/issues/112314
 
 # Examples:
 #

diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java
@@ -638,6 +638,7 @@ public void testResponseHeaders() {
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/112256")
     public void testDropWarningsExceedingMaxSettings() {
         Settings settings = Settings.builder()
             .put(HttpTransportSettings.SETTING_HTTP_MAX_WARNING_HEADER_COUNT.getKey(), 1)

diff --git a/...b-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java b/...b-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java
@@ -444,6 +444,7 @@ public void testMassiveDecay() throws IOException {
      * Exercise SharedBlobCacheService#get in multiple threads to trigger any assertion errors.
      * @throws IOException
      */
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/112305")
     public void testGetMultiThreaded() throws IOException {
         final int threads = between(2, 10);
         final int regionCount = between(1, 20);