Skip to content

Commit 9cd0db7

Browse files
authored
Update XPackPlugin for project awareness (#124087)
This updates XPackPlugin.alreadyContainsXPackCustomMetadata to consider all projects
1 parent 47706b5 commit 9cd0db7

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.cluster.ClusterState;
1717
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1818
import org.elasticsearch.cluster.metadata.Metadata;
19+
import org.elasticsearch.cluster.metadata.ProjectMetadata;
1920
import org.elasticsearch.cluster.node.DiscoveryNode;
2021
import org.elasticsearch.cluster.node.DiscoveryNodes;
2122
import org.elasticsearch.cluster.routing.allocation.DataTier;
@@ -296,11 +297,15 @@ public static List<DiscoveryNode> nodesNotReadyForXPackCustomMetadata(ClusterSta
296297
private static boolean alreadyContainsXPackCustomMetadata(ClusterState clusterState) {
297298
final Metadata metadata = clusterState.metadata();
298299
return metadata.custom(LicensesMetadata.TYPE) != null
299-
|| metadata.getProject().custom(MlMetadata.TYPE) != null
300-
|| metadata.getProject().custom(WatcherMetadata.TYPE) != null
301-
|| RoleMappingMetadata.getFromClusterState(clusterState).isEmpty() == false
302300
|| clusterState.custom(TokenMetadata.TYPE) != null
303-
|| metadata.getProject().custom(TransformMetadata.TYPE) != null;
301+
|| metadata.projects().values().stream().anyMatch(XPackPlugin::alreadyContainsXPackCustomMetadata);
302+
}
303+
304+
private static boolean alreadyContainsXPackCustomMetadata(ProjectMetadata project) {
305+
return project.custom(MlMetadata.TYPE) != null
306+
|| project.custom(WatcherMetadata.TYPE) != null
307+
|| RoleMappingMetadata.getFromProject(project).isEmpty() == false
308+
|| project.custom(TransformMetadata.TYPE) != null;
304309
}
305310

306311
@Override

0 commit comments

Comments
 (0)