Merge remote-tracking branch 'upstream/main' into multi_proj_file_auth

Author: jfreden

.buildkite/pipelines/periodic.template.yml

@@ -218,7 +218,7 @@ steps:
             ES_VERSION:
               - "9.0.0"
             ES_COMMIT:
-              - "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
+              - "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic.yml

@@ -637,7 +637,7 @@ steps:
             ES_VERSION:
               - "9.0.0"
             ES_COMMIT:
-              - "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
+              - "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump maintained from combat-lucene-10-0-0 branch
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

docs/changelog/122885.yaml

@@ -0,0 +1,5 @@
+pr: 122885
+summary: Run `TransportExplainLifecycleAction` on local node
+area: ILM+SLM
+type: enhancement
+issues: []

server/src/main/java/org/elasticsearch/action/search/CCSSingleCoordinatorSearchProgressListener.java

@@ -188,7 +188,7 @@ public void onPartialReduce(List<SearchShard> shards, TotalHits totalHits, Inter
 
         for (Map.Entry<String, Integer> entry : totalByClusterAlias.entrySet()) {
             String clusterAlias = entry.getKey();
-            int successfulCount = entry.getValue().intValue();
+            int successfulCount = entry.getValue();
 
             clusters.swapCluster(clusterAlias, (k, v) -> {
                 SearchResponse.Cluster.Status status = v.getStatus();
@@ -231,7 +231,7 @@ public void onFinalReduce(List<SearchShard> shards, TotalHits totalHits, Interna
 
         for (Map.Entry<String, Integer> entry : totalByClusterAlias.entrySet()) {
             String clusterAlias = entry.getKey();
-            int successfulCount = entry.getValue().intValue();
+            int successfulCount = entry.getValue();
 
             clusters.swapCluster(clusterAlias, (k, v) -> {
                 SearchResponse.Cluster.Status status = v.getStatus();

server/src/main/java/org/elasticsearch/action/search/CountOnlyQueryPhaseResultConsumer.java

@@ -27,8 +27,8 @@
  * store any other information.
  */
 class CountOnlyQueryPhaseResultConsumer extends SearchPhaseResults<SearchPhaseResult> {
-    AtomicReference<TotalHits.Relation> relationAtomicReference = new AtomicReference<>(TotalHits.Relation.EQUAL_TO);
-    LongAdder totalHits = new LongAdder();
+    final AtomicReference<TotalHits.Relation> relationAtomicReference = new AtomicReference<>(TotalHits.Relation.EQUAL_TO);
+    final LongAdder totalHits = new LongAdder();
 
     private final AtomicBoolean terminatedEarly = new AtomicBoolean(false);
     private final AtomicBoolean timedOut = new AtomicBoolean(false);

server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java

@@ -121,14 +121,6 @@ public SearchRequestBuilder setWaitForCheckpoints(Map<String, long[]> waitForChe
         return this;
     }
 
-    /**
-     * Set the timeout for the {@link #setWaitForCheckpoints(Map)} request.
-     */
-    public SearchRequestBuilder setWaitForCheckpointsTimeout(final TimeValue waitForCheckpointsTimeout) {
-        request.setWaitForCheckpointsTimeout(waitForCheckpointsTimeout);
-        return this;
-    }
-
     /**
      * Specifies what type of requested indices to ignore and wildcard indices expressions.
      * <p>

server/src/main/java/org/elasticsearch/action/search/SearchResponse.java

@@ -786,7 +786,7 @@ public boolean hasPartialResults() {
          * for tracking search Cluster details.
          */
         public boolean hasClusterObjects() {
-            return clusterInfo.keySet().size() > 0;
+            return clusterInfo.isEmpty() == false;
         }
 
         /**
@@ -855,27 +855,6 @@ public Cluster(String clusterAlias, String indexExpression, boolean skipUnavaila
             this(clusterAlias, indexExpression, skipUnavailable, Status.RUNNING, null, null, null, null, null, null, false);
         }
 
-        /**
-         * Create a Cluster with a new Status and one or more ShardSearchFailures. This constructor
-         * should only be used for fatal failures where shard counters (total, successful, skipped, failed)
-         * are not known (unset).
-         * @param clusterAlias clusterAlias as defined in the remote cluster settings or RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY
-         *                     for the local cluster
-         * @param indexExpression the original (not resolved/concrete) indices expression provided for this cluster.
-         * @param skipUnavailable whether cluster is marked as skip_unavailable in remote cluster settings
-         * @param status current status of the search on this Cluster
-         * @param failures list of failures that occurred during the search on this Cluster
-         */
-        public Cluster(
-            String clusterAlias,
-            String indexExpression,
-            boolean skipUnavailable,
-            Status status,
-            List<ShardSearchFailure> failures
-        ) {
-            this(clusterAlias, indexExpression, skipUnavailable, status, null, null, null, null, failures, null, false);
-        }
-
         public Cluster(
             String clusterAlias,
             String indexExpression,
@@ -1034,7 +1013,7 @@ public void writeTo(StreamOutput out) throws IOException {
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             String name = clusterAlias;
-            if (clusterAlias.equals("")) {
+            if (clusterAlias.isEmpty()) {
                 name = LOCAL_CLUSTER_NAME_REPRESENTATION;
             }
             builder.startObject(name);

server/src/main/java/org/elasticsearch/cluster/ClusterState.java

@@ -350,6 +350,28 @@ public boolean hasMixedSystemIndexVersions() {
             .anyMatch(e -> e.systemIndexMappingsVersion().equals(minVersions.systemIndexMappingsVersion()) == false);
     }
 
+    /**
+     * @return the minimum {@link TransportVersion} that will be used for all future intra-cluster node-to-node communications. This value
+     *         only ever increases, so if {@code v.onOrAfter(cs.getMinTransportVersion())} is true once then it will remain true in the
+     *         future.
+     * <p>
+     * There are some subtle exceptions:
+     * <ul>
+     * <li>The "only ever increases" property is handled by the master node using the in-memory (ephemeral) part of the
+     *     {@link ClusterState} only, so in theory a full restart of a mixed-version cluster may lose that state and allow some nodes to see
+     *     this value decrease. For this to happen in practice requires some fairly unlucky timing during the initial master election. We
+     *     tell users not to do this: if something breaks during a rolling upgrade then they should upgrade all remaining nodes to continue.
+     *     But we do not enforce it.
+     * <li>The "used for all node-to-node communications" is false in a disordered upgrade (an upgrade to a semantically-newer but
+     *     chronologically-older version) because for each connection between such nodes we will use {@link
+     *     TransportVersion#bestKnownVersion} to pick a transport version which is known by both endpoints. We tell users not to do
+     *     disordered upgrades too, but do not enforce it.
+     * </ul>
+     * <p>
+     * Note also that node-to-node communications which are not <i>intra-cluster</i> (i.e. they are not between nodes in the same cluster)
+     * may sometimes use an earlier {@link TransportVersion} than this value. This includes remote-cluster communication, and communication
+     * with nodes that are just starting up or otherwise are attempting to join this cluster.
+     */
     public TransportVersion getMinTransportVersion() {
         return this.minVersions.transportVersion();
     }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java

@@ -10,7 +10,6 @@
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.InternalAggregations;
 
 import java.io.IOException;
@@ -25,10 +24,6 @@ public class InternalDateRange extends InternalRange<InternalDateRange.Bucket, I
 
     public static class Bucket extends InternalRange.Bucket {
 
-        public Bucket(String key, double from, double to, long docCount, List<InternalAggregation> aggregations, DocValueFormat formatter) {
-            super(key, from, to, docCount, InternalAggregations.from(aggregations), formatter);
-        }
-
         public Bucket(String key, double from, double to, long docCount, InternalAggregations aggregations, DocValueFormat formatter) {
             super(key, from, to, docCount, aggregations, formatter);
         }

server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java

@@ -124,14 +124,6 @@ public PointInTimeBuilder setKeepAlive(TimeValue keepAlive) {
         return this;
     }
 
-    /**
-     * If specified, the search layer will keep this point in time around for at least the given keep-alive.
-     * Otherwise, the point in time will be kept around until the original keep alive elapsed.
-     */
-    public PointInTimeBuilder setKeepAlive(String keepAlive) {
-        return setKeepAlive(TimeValue.parseTimeValue(keepAlive, "keep_alive"));
-    }
-
     @Nullable
     public TimeValue getKeepAlive() {
         return keepAlive;