Skip to content

[8.x] Converting an Existing Data Stream to a System DataStream is Broken (#121392) #123183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2025
Merged

[8.x] Converting an Existing Data Stream to a System DataStream is Broken (#121392) #123183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/121392.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 121392
summary: Include data streams when converting an existing resource to a system resource
area: Infra/Core
type: bug
issues: []
19 changes: 14 additions & 5 deletions server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,13 @@ public boolean isFailureStoreIndex(String indexName) {
return failureIndices.containsIndex(indexName);
}

/**
* Returns true if the index name provided belongs to this data stream.
*/
public boolean containsIndex(String indexName) {
return backingIndices.containsIndex(indexName) || failureIndices.containsIndex(indexName);
}

public DataStreamOptions getDataStreamOptions() {
return dataStreamOptions;
}
Expand Down Expand Up @@ -782,8 +789,9 @@ public DataStream addBackingIndex(Metadata clusterMetadata, Index index) {
// ensure that no aliases reference index
ensureNoAliasesOnIndex(clusterMetadata, index);

List<Index> backingIndices = new ArrayList<>(this.backingIndices.indices);
backingIndices.add(0, index);
List<Index> backingIndices = new ArrayList<>(this.backingIndices.indices.size() + 1);
backingIndices.add(index);
backingIndices.addAll(this.backingIndices.indices);
assert backingIndices.size() == this.backingIndices.indices.size() + 1;
return copy().setBackingIndices(this.backingIndices.copy().setIndices(backingIndices).build())
.setGeneration(generation + 1)
Expand All @@ -808,8 +816,9 @@ public DataStream addFailureStoreIndex(Metadata clusterMetadata, Index index) {

ensureNoAliasesOnIndex(clusterMetadata, index);

List<Index> updatedFailureIndices = new ArrayList<>(failureIndices.indices);
updatedFailureIndices.add(0, index);
List<Index> updatedFailureIndices = new ArrayList<>(failureIndices.indices.size() + 1);
updatedFailureIndices.add(index);
updatedFailureIndices.addAll(failureIndices.indices);
assert updatedFailureIndices.size() == failureIndices.indices.size() + 1;
return copy().setFailureIndices(failureIndices.copy().setIndices(updatedFailureIndices).build())
.setGeneration(generation + 1)
Expand Down Expand Up @@ -1039,7 +1048,7 @@ private boolean isIndexOlderThan(
* we return false.
*/
public boolean isIndexManagedByDataStreamLifecycle(Index index, Function<String, IndexMetadata> indexMetadataSupplier) {
if (backingIndices.containsIndex(index.getName()) == false && failureIndices.containsIndex(index.getName()) == false) {
if (containsIndex(index.getName()) == false) {
return false;
}
IndexMetadata indexMetadata = indexMetadataSupplier.apply(index.getName());
Expand Down
Loading