Merge branch 'main' of https://github.com/Jan-Kazlouski-elastic/elasticsearch into feature/hugging-face-chat-completion-integration

Author: Jan-Kazlouski-elastic

docs/reference/query-languages/query-dsl/query-dsl-function-score-query.md

@@ -99,7 +99,7 @@ The new score can be restricted to not exceed a certain limit by setting the `ma
 The newly computed score is combined with the score of the query. The parameter `boost_mode` defines how:
 
 `multiply`
-:   query score and function score is multiplied (default)
+:   query score and function score are multiplied (default)
 
 `replace`
 :   only function score is used, the query score is ignored

muted-tests.yml

@@ -417,9 +417,6 @@ tests:
 - class: org.elasticsearch.action.admin.indices.diskusage.IndexDiskUsageAnalyzerTests
   method: testKnnVectors
   issue: https://github.com/elastic/elasticsearch/issues/127689
-- class: org.elasticsearch.snapshots.SnapshotShutdownIT
-  method: testSnapshotShutdownProgressTracker
-  issue: https://github.com/elastic/elasticsearch/issues/127690
 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
   method: test {p0=search/350_point_in_time/point-in-time with index filter}
   issue: https://github.com/elastic/elasticsearch/issues/127741

server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotShutdownIT.java

@@ -480,7 +480,7 @@ public void testShutdownWhileSuccessInFlight() throws Exception {
     )
     public void testSnapshotShutdownProgressTracker() throws Exception {
         final var repoName = randomIdentifier();
-        final int numShards = randomIntBetween(1, 10);
+        final int numShards = randomIntBetween(1, 9);
         createRepository(repoName, "mock");
 
         // Create another index on another node which will be blocked (remain in state INIT) throughout.
@@ -540,12 +540,14 @@ public void testSnapshotShutdownProgressTracker() throws Exception {
         mockLog.awaitAllExpectationsMatched();
         resetMockLog();
 
+        // At least one shard reached the MockRepository's blocking code when waitForBlock was called. However, there's no guarantee that
+        // the other shards got that far before the shutdown flag was put in place, in which case the other shards may be paused instead.
         mockLog.addExpectation(
-            new MockLog.SeenEventExpectation(
+            new MockLog.PatternSeenEventExpectation(
                 "SnapshotShutdownProgressTracker running number of snapshots",
                 SnapshotShutdownProgressTracker.class.getCanonicalName(),
                 Level.INFO,
-                "*Number shard snapshots running [" + numShards + "].*"
+                ".+Number shard snapshots running \\[[1-" + numShards + "]].+"
             )
         );