Merge branch 'main' into mp-rest-tests

Author: nielsbauman

benchmarks/src/main/java/org/elasticsearch/benchmark/indices/resolution/IndexNameExpressionResolverBenchmark.java

@@ -16,7 +16,8 @@
 import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
-import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectId;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.project.DefaultProjectResolver;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -63,12 +64,12 @@ public void setUp() {
         int numDataStreams = toInt(params[0]);
         int numIndices = toInt(params[1]);
 
-        Metadata.Builder mb = Metadata.builder();
+        ProjectMetadata.Builder pmb = ProjectMetadata.builder(ProjectId.DEFAULT);
         String[] indices = new String[numIndices + numDataStreams * (numIndices + 1)];
         int position = 0;
         for (int i = 1; i <= numIndices; i++) {
             String indexName = INDEX_PREFIX + i;
-            createIndexMetadata(indexName, mb);
+            createIndexMetadata(indexName, pmb);
             indices[position++] = indexName;
         }
 
@@ -77,14 +78,14 @@ public void setUp() {
             List<Index> backingIndices = new ArrayList<>();
             for (int j = 1; j <= numIndices; j++) {
                 String backingIndexName = DataStream.getDefaultBackingIndexName(dataStreamName, j);
-                backingIndices.add(createIndexMetadata(backingIndexName, mb).getIndex());
+                backingIndices.add(createIndexMetadata(backingIndexName, pmb).getIndex());
                 indices[position++] = backingIndexName;
             }
             indices[position++] = dataStreamName;
-            mb.put(DataStream.builder(dataStreamName, backingIndices).build());
+            pmb.put(DataStream.builder(dataStreamName, backingIndices).build());
         }
         int mid = indices.length / 2;
-        clusterState = ClusterState.builder(ClusterName.DEFAULT).metadata(mb).build();
+        clusterState = ClusterState.builder(ClusterName.DEFAULT).putProjectMetadata(pmb).build();
         resolver = new IndexNameExpressionResolver(
             new ThreadContext(Settings.EMPTY),
             new SystemIndices(List.of()),
@@ -97,13 +98,13 @@ public void setUp() {
         mixedRequest = new Request(IndicesOptions.lenientExpandOpenHidden(), mixed);
     }
 
-    private IndexMetadata createIndexMetadata(String indexName, Metadata.Builder mb) {
+    private IndexMetadata createIndexMetadata(String indexName, ProjectMetadata.Builder pmb) {
         IndexMetadata indexMetadata = IndexMetadata.builder(indexName)
             .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current()))
             .numberOfShards(1)
             .numberOfReplicas(0)
             .build();
-        mb.put(indexMetadata, false);
+        pmb.put(indexMetadata, false);
         return indexMetadata;
     }
 

benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/ShardsAvailabilityHealthIndicatorBenchmark.java

@@ -12,7 +12,8 @@
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectId;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.project.DefaultProjectResolver;
 import org.elasticsearch.cluster.routing.IndexRoutingTable;
@@ -96,7 +97,7 @@ public void setUp() throws Exception {
 
         AllocationService allocationService = Allocators.createAllocationService(Settings.EMPTY);
 
-        Metadata.Builder mb = Metadata.builder();
+        ProjectMetadata.Builder pmb = ProjectMetadata.builder(ProjectId.DEFAULT);
         RoutingTable.Builder rb = RoutingTable.builder();
 
         DiscoveryNodes.Builder nb = DiscoveryNodes.builder();
@@ -160,12 +161,12 @@ public void setUp() throws Exception {
             }
 
             routingTable.add(indexRountingTableBuilder);
-            mb.put(indexMetadata, false);
+            pmb.put(indexMetadata, false);
         }
 
         ClusterState initialClusterState = ClusterState.builder(ClusterName.DEFAULT)
-            .metadata(mb)
-            .routingTable(routingTable)
+            .putProjectMetadata(pmb)
+            .putRoutingTable(pmb.getId(), routingTable.build())
             .nodes(nb)
             .build();
 

docs/changelog/126786.yaml

@@ -0,0 +1,5 @@
+pr: 126786
+summary: Account for time taken to write index buffers in `IndexingMemoryController`
+area: Distributed
+type: enhancement
+issues: []

docs/reference/query-languages/esql/_snippets/functions/functionNamedParams/qstr.md

@@ -527,7 +527,9 @@ private static ShardStats getShardStats(IndexMetadata indexMeta, int shardIndex,
         CommonStats stats = new CommonStats();
         stats.docs = new DocsStats(100, 0, randomByteSizeValue().getBytes());
         stats.store = new StoreStats();
-        stats.indexing = new IndexingStats(new IndexingStats.Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, false, 1, targetWriteLoad, 1, 0.123, 0.234));
+        stats.indexing = new IndexingStats(
+            new IndexingStats.Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, false, 1, targetWriteLoad, targetWriteLoad, 1, 0.123, 0.234)
+        );
         return new ShardStats(shardRouting, new ShardPath(false, path, path, shardId), stats, null, null, null, false, 0);
     }