Skip to content

Update XPackPlugin for project awareness #124087

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 3 commits into from
Mar 5, 2025
Merged

Update XPackPlugin for project awareness #124087

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d938b0b
Update XPackPlugin for project awareness
tvernum Mar 5, 2025
313c028
Merge branch 'main' into multi-project/x-pack/metadata
tvernum Mar 5, 2025
e43f018
Merge branch 'main' into multi-project/x-pack/metadata
tvernum Mar 5, 2025
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
13 changes: 9 additions & 4 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.routing.allocation.DataTier;
Expand Down Expand Up @@ -296,11 +297,15 @@ public static List<DiscoveryNode> nodesNotReadyForXPackCustomMetadata(ClusterSta
private static boolean alreadyContainsXPackCustomMetadata(ClusterState clusterState) {
final Metadata metadata = clusterState.metadata();
return metadata.custom(LicensesMetadata.TYPE) != null
|| metadata.getProject().custom(MlMetadata.TYPE) != null
|| metadata.getProject().custom(WatcherMetadata.TYPE) != null
|| RoleMappingMetadata.getFromClusterState(clusterState).isEmpty() == false
|| clusterState.custom(TokenMetadata.TYPE) != null
|| metadata.getProject().custom(TransformMetadata.TYPE) != null;
|| metadata.projects().values().stream().anyMatch(XPackPlugin::alreadyContainsXPackCustomMetadata);
}

private static boolean alreadyContainsXPackCustomMetadata(ProjectMetadata project) {
return project.custom(MlMetadata.TYPE) != null
|| project.custom(WatcherMetadata.TYPE) != null
|| RoleMappingMetadata.getFromProject(project).isEmpty() == false
|| project.custom(TransformMetadata.TYPE) != null;
}

@Override
Expand Down