Skip to content

Commit 4344a10

Browse files
authored
AutoCreation waits for active shards in the right project context (#124636)
This PR replaces the default project ID with the actual project while waiting for active shards after index auto-creation similar to how wait is done for explicit index creation.
1 parent d7864f4 commit 4344a10

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

server/src/main/java/org/elasticsearch/action/admin/indices/create/AutoCreateAction.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.cluster.block.ClusterBlockLevel;
2828
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
2929
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
30-
import org.elasticsearch.cluster.metadata.Metadata;
3130
import org.elasticsearch.cluster.metadata.MetadataCreateDataStreamService;
3231
import org.elasticsearch.cluster.metadata.MetadataCreateDataStreamService.CreateDataStreamClusterStateUpdateRequest;
3332
import org.elasticsearch.cluster.metadata.MetadataCreateIndexService;
@@ -195,7 +194,7 @@ public boolean mustAck(DiscoveryNode discoveryNode) {
195194
public void onAllNodesAcked() {
196195
ActiveShardsObserver.waitForActiveShards(
197196
clusterService,
198-
Metadata.DEFAULT_PROJECT_ID,
197+
projectId,
199198
indexNames.toArray(String[]::new),
200199
ActiveShardCount.DEFAULT,
201200
request.ackTimeout(),

0 commit comments

Comments
 (0)