Merge branch 'elastic:main' into feature/data_stream_in_search_hit

Author: seanzatzdev

docs/reference/elasticsearch/mapping-reference/semantic-text.md

@@ -35,7 +35,7 @@ the embedding generation, indexing, and query to use.
 
 {applies_to}`stack: ga 9.1`  Newly created indices with `semantic_text` fields using dense embeddings will be
 [quantized](/reference/elasticsearch/mapping-reference/dense-vector.md#dense-vector-quantization)
-to `bbq_hnsw` automatically.
+to `bbq_hnsw` automatically as long as they have a minimum of 64 dimensions.
 
 ## Default and custom endpoints
 

muted-tests.yml

@@ -449,9 +449,6 @@ tests:
 - class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
   method: testCancellationViaTimeoutWithAllowPartialResultsSetToFalse
   issue: https://github.com/elastic/elasticsearch/issues/131248
-- class: org.elasticsearch.action.admin.cluster.node.tasks.CancellableTasksIT
-  method: testRemoveBanParentsOnDisconnect
-  issue: https://github.com/elastic/elasticsearch/issues/131562
 - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
   method: testPartialResults
   issue: https://github.com/elastic/elasticsearch/issues/131481

server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java

@@ -363,6 +363,10 @@ public void testRemoveBanParentsOnDisconnect() throws Exception {
             allowEntireRequest(rootRequest);
             cancelFuture.actionGet();
             ensureBansAndCancellationsConsistency();
+            // This method will call the cluster health API with wait_for_tasks set to Priority#LANGUID. This will ensure that all tasks
+            // currently submitted to the master service (included re-election after a disconnect) are processed before returning. This
+            // ensures cluster stability for the post-test consistency checks.
+            ensureStableCluster(nodes.size());
         }
     }
 

server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java

@@ -469,9 +469,6 @@ private void runTask(String source, Function<ClusterState, ClusterState> updateF
                 );
                 warnAboutSlowTaskIfNeeded(executionTime, source, stopWatch);
             } catch (Exception e) {
-                // failing to apply a cluster state with an exception indicates a bug in validation or in one of the appliers; if we
-                // continue we will retry with the same cluster state but that might not help.
-                assert applicationMayFail();
                 timedListener.onFailure(e);
                 TimeValue executionTime = getTimeSince(startTimeMillis);
                 if (logger.isTraceEnabled()) {
@@ -492,6 +489,9 @@ private void runTask(String source, Function<ClusterState, ClusterState> updateF
                         e
                     );
                 }
+                // failing to apply a cluster state with an exception indicates a bug in validation or in one of the appliers; if we
+                // continue we will retry with the same cluster state but that might not help.
+                assert applicationMayFail();
             } finally {
                 clearIsApplyingClusterState();
             }

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

@@ -1382,6 +1382,15 @@ private void setMultiProjectParams(Map<String, String> xContentParams) {
         }
     }
 
+    /**
+     * Verifies that all nodes in the cluster see the same master node and cluster UUID and use the same JSON serialization.
+     * <ul>
+     * <li> Fetches the cluster state from every node in the cluster </li>
+     * <li> Fetches the master node's view of the cluster state </li>
+     * <li> Compares each node's view with the master node's </li>
+     * </ul>
+     * @param namedWriteableRegistry
+     */
     protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry namedWriteableRegistry) {
         // This check has very little value in external test clusters and there is no guaranteed method of obtaining the master cluster
         // state in those clusters.
@@ -1409,6 +1418,10 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
                 );
                 Map<String, Object> masterStateMap = convertToMap(masterClusterState, xContentParams());
                 String masterId = masterClusterState.nodes().getMasterNodeId();
+                if (masterId == null) {
+                    logger.warn("Failed to find an elected master in the cluster state: " + masterClusterState);
+                    throw new AssertionError("Unable to find master in cluster state. Expecting a stable master node");
+                }
                 for (SubscribableListener<ClusterStateResponse> localStateListener : localStates) {
                     localStateListener.andThenAccept(localClusterStateResponse -> {
                         byte[] localClusterStateBytes = ClusterState.Builder.toBytes(localClusterStateResponse.getState());