Make DLM stats and DLM error store project-aware #124810
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is part of the work to make DLM project-aware. These two features were pretty tightly coupled, so I saved some effort by combining them in one PR.
nielsbauman
added
>non-issue
:Data Management/Data streams
|
Pinging @elastic/es-data-management (Team:Data Management) |
ywangd
approved these changes
Mar 14, 2025
...ams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleErrorStore.java
Outdated
Show resolved
Hide resolved
| @@ -779,21 +780,22 @@ static List<Index> getTargetIndices( | |||
| */ | |||
| private void clearErrorStoreForUnmanagedIndices(DataStream dataStream) { | |||
| Metadata metadata = clusterService.state().metadata(); | |||
| for (String indexName : errorStore.getAllIndices()) { | |||
| final var projectId = metadata.getProject().id(); | |||
| for (String indexName : errorStore.getAllIndices(projectId)) { | |||
| IndexAbstraction indexAbstraction = metadata.getProject().getIndicesLookup().get(indexName); | |||
There was a problem hiding this comment.
Nit:
Suggested change
| IndexAbstraction indexAbstraction = metadata.getProject().getIndicesLookup().get(indexName); | |
| IndexAbstraction indexAbstraction = metadata.getProject(projectId).getIndicesLookup().get(indexName); |
to keep deprecation in one place.
There was a problem hiding this comment.
I already have local changes ready to make DataStreamLifecycleService project aware - overriding these changes. So I'll leave this as is for now.
Comment on lines
+1341
to
+1342
| @FixForMultiProject(description = "Don't use default project ID") | ||
| final var projectId = Metadata.DEFAULT_PROJECT_ID; |
There was a problem hiding this comment.
Not for this PR. But I wonder whether we could remove Metadata.DEFAULT_PROJECT_ID and replace it with a deprecated method, e.g.:
@Deprecated(forRemoval=true)
public static ProjectId defaultProjectId() {
return ProjectId.DEFAULT;
}We can then use the above method in all places where default project id is meant to be a placeholder. And use ProjectId.DEFAULT for places we actually want the default ID. What do you think?
There was a problem hiding this comment.
I think that's a great idea, we should have done that earlier :)
...reams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleFixtures.java
Outdated
Show resolved
Hide resolved
smalyshev
pushed a commit
to smalyshev/elasticsearch
that referenced
this pull request
Mar 21, 2025
This is part of the work to make DLM project-aware. These two features were pretty tightly coupled, so I saved some effort by combining them in one PR.
omricohenn
pushed a commit
to omricohenn/elasticsearch
that referenced
this pull request
Mar 28, 2025
This is part of the work to make DLM project-aware. These two features were pretty tightly coupled, so I saved some effort by combining them in one PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is part of the work to make DLM project-aware.
These two features were pretty tightly coupled, so I saved some effort by combining them in one PR.