Merge branch 'main' into sort_other_numeric_types

Author: mayya-sharipova

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/ExplainDataStreamLifecycleIT.java

@@ -486,7 +486,9 @@ public void testExplainLifecycleForIndicesWithErrors() throws Exception {
                  * succeed, and there will always be an error in the error store. This behavior is subject to change in the future.
                  */
                 assertThat(response.getIndices().get(0).getError(), is(notNullValue()));
-                assertThat(response.getIndices().get(1).getError(), is(nullValue()));
+                assertThat(response.getIndices().get(0).getError().error(), containsString("Force merge request "));
+                assertThat(response.getIndices().get(1).getError(), is(notNullValue()));
+                assertThat(response.getIndices().get(1).getError().error(), containsString("Force merge request "));
             }
         });
     }

muted-tests.yml

@@ -387,9 +387,6 @@ tests:
 - class: org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshotsIntegTests
   method: testCreateAndRestoreSearchableSnapshot
   issue: https://github.com/elastic/elasticsearch/issues/119709
-- class: org.elasticsearch.datastreams.lifecycle.ExplainDataStreamLifecycleIT
-  method: testExplainLifecycleForIndicesWithErrors
-  issue: https://github.com/elastic/elasticsearch/issues/126252
 - class: org.elasticsearch.xpack.test.rest.XPackRestIT
   method: test {p0=transform/transforms_stats/Test get transform stats}
   issue: https://github.com/elastic/elasticsearch/issues/126270
@@ -405,6 +402,9 @@ tests:
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test023InstallPluginUsingConfigFile
   issue: https://github.com/elastic/elasticsearch/issues/126145
+- class: org.elasticsearch.search.SearchWithRejectionsIT
+  method: testOpenContextsAfterRejections
+  issue: https://github.com/elastic/elasticsearch/issues/126340
 
 # Examples:
 #

server/src/main/java/org/elasticsearch/action/datastreams/autosharding/AutoShardingResult.java

@@ -9,7 +9,7 @@
 
 package org.elasticsearch.action.datastreams.autosharding;
 
-import org.elasticsearch.core.Nullable;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.core.TimeValue;
 
 import java.util.Arrays;
@@ -25,13 +25,7 @@
  * {@link DataStreamAutoShardingService#DATA_STREAMS_AUTO_SHARDING_EXCLUDES_SETTING}) the target number of shards will be -1 and cool down
  * remaining {@link TimeValue#MAX_VALUE}.
  */
-public record AutoShardingResult(
-    AutoShardingType type,
-    int currentNumberOfShards,
-    int targetNumberOfShards,
-    TimeValue coolDownRemaining,
-    @Nullable Double writeLoad
-) {
+public record AutoShardingResult(AutoShardingType type, int currentNumberOfShards, int targetNumberOfShards, TimeValue coolDownRemaining) {
 
     static final String COOLDOWN_PREVENTING_TYPES = Arrays.toString(
         new AutoShardingType[] { COOLDOWN_PREVENTED_DECREASE, COOLDOWN_PREVENTED_INCREASE }
@@ -53,8 +47,36 @@ public record AutoShardingResult(
         AutoShardingType.NOT_APPLICABLE,
         -1,
         -1,
-        TimeValue.MAX_VALUE,
-        null
+        TimeValue.MAX_VALUE
     );
 
+    @Override
+    public String toString() {
+        return switch (type) {
+            case INCREASE_SHARDS -> Strings.format(
+                "Recommendation to increase shards from %d to %d",
+                currentNumberOfShards,
+                targetNumberOfShards
+            );
+            case DECREASE_SHARDS -> Strings.format(
+                "Recommendation to decrease shards from %d to %d",
+                currentNumberOfShards,
+                targetNumberOfShards
+            );
+            case COOLDOWN_PREVENTED_INCREASE -> Strings.format(
+                "Deferred recommendation to increase shards from %d to %d after cooldown period %s",
+                currentNumberOfShards,
+                targetNumberOfShards,
+                coolDownRemaining
+            );
+            case COOLDOWN_PREVENTED_DECREASE -> Strings.format(
+                "Deferred recommendation to decrease shards from %d to %d after cooldown period %s",
+                currentNumberOfShards,
+                targetNumberOfShards,
+                coolDownRemaining
+            );
+            case NO_CHANGE_REQUIRED -> Strings.format("Recommendation to leave shards unchanged at %d", currentNumberOfShards);
+            case NOT_APPLICABLE -> "No recommendation as auto-sharding not enabled";
+        };
+    }
 }