Skip to content

Commit a4f919f

Browse files
committed
Bug fix: pass along system descriptor when creating a failure index
1 parent 24c5abe commit a4f919f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ private RolloverResult rolloverDataStream(
360360
projectState.cluster(),
361361
now.toEpochMilli(),
362362
dataStreamName,
363+
systemDataStreamDescriptor,
363364
templateV2,
364365
newWriteIndexName,
365366
(builder, indexMetadata) -> builder.put(dataStream.rolloverFailureStore(indexMetadata.getIndex(), newGeneration))

server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ static ClusterState createDataStream(
290290
currentState,
291291
request.startTime(),
292292
dataStreamName,
293+
systemDataStreamDescriptor,
293294
template,
294295
failureStoreIndexName,
295296
null
@@ -419,6 +420,7 @@ public static ClusterState createFailureStoreIndex(
419420
ClusterState currentState,
420421
long nameResolvedInstant,
421422
String dataStreamName,
423+
SystemDataStreamDescriptor systemDataStreamDescriptor,
422424
ComposableIndexTemplate template,
423425
String failureStoreIndexName,
424426
@Nullable BiConsumer<ProjectMetadata.Builder, IndexMetadata> metadataTransformer
@@ -439,7 +441,8 @@ public static ClusterState createFailureStoreIndex(
439441
.performReroute(false)
440442
.setMatchingTemplate(template)
441443
.settings(indexSettings)
442-
.isFailureIndex(true);
444+
.isFailureIndex(true)
445+
.systemDataStreamDescriptor(systemDataStreamDescriptor);
443446

444447
try {
445448
currentState = metadataCreateIndexService.applyCreateIndexRequest(

0 commit comments

Comments
 (0)