github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-29 01:44:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use ProjectResolver in PrevalidateNodeRemoval

Browse source
This commit is contained in:
Pooya Salehi 2024-12-04 17:34:32 +01:00
parent 48281b8424
commit 3b6a2776a2
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalAction.java
View file

@ -23,6 +23,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.Metadata; import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.core.Strings; import org.elasticsearch.core.Strings;
@ -55,6 +56,7 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
private static final Logger logger = LogManager.getLogger(TransportPrevalidateNodeRemovalAction.class); private static final Logger logger = LogManager.getLogger(TransportPrevalidateNodeRemovalAction.class);
private final NodeClient client; private final NodeClient client;
private final ProjectResolver projectResolver;
@Inject @Inject
public TransportPrevalidateNodeRemovalAction( public TransportPrevalidateNodeRemovalAction(
@ -63,7 +65,8 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
ThreadPool threadPool, ThreadPool threadPool,
ActionFilters actionFilters, ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver, IndexNameExpressionResolver indexNameExpressionResolver,
NodeClient client NodeClient client,
ProjectResolver projectResolver
) { ) {
super( super(
PrevalidateNodeRemovalAction.NAME, PrevalidateNodeRemovalAction.NAME,
@ -78,6 +81,7 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
EsExecutors.DIRECT_EXECUTOR_SERVICE EsExecutors.DIRECT_EXECUTOR_SERVICE
); );
this.client = client; this.client = client;
this.projectResolver = projectResolver;
} }
@Override @Override
@ -89,6 +93,9 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
) { ) {
ActionListener.run(responseListener, listener -> { ActionListener.run(responseListener, listener -> {
Set<DiscoveryNode> requestNodes = resolveNodes(request, state.nodes()); Set<DiscoveryNode> requestNodes = resolveNodes(request, state.nodes());
if (projectResolver.supportsMultipleProjects()) {
throw new IllegalStateException("The node removal prevalidation API does not support a multi-project setup");
}
doPrevalidation(request, requestNodes, state, listener); doPrevalidation(request, requestNodes, state, listener);
}); });
} }
@ -161,8 +168,8 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
logger.debug(() -> "prevalidate node removal for nodes " + requestNodes); logger.debug(() -> "prevalidate node removal for nodes " + requestNodes);
ClusterStateHealth clusterStateHealth = new ClusterStateHealth( ClusterStateHealth clusterStateHealth = new ClusterStateHealth(
clusterState, clusterState,
clusterState.metadata().getProject().getConcreteAllIndices(), projectResolver.getProjectMetadata(clusterState).getConcreteAllIndices(),
clusterState.metadata().getProject().id() projectResolver.getProjectId()
); );
Metadata metadata = clusterState.metadata(); Metadata metadata = clusterState.metadata();
DiscoveryNodes clusterNodes = clusterState.getNodes(); DiscoveryNodes clusterNodes = clusterState.getNodes();
@ -191,7 +198,7 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
.collect(Collectors.toSet()); .collect(Collectors.toSet());
// If all red indices are searchable snapshot indices, it is safe to remove any node. // If all red indices are searchable snapshot indices, it is safe to remove any node.
Set<String> redNonSSIndices = redIndices.stream() Set<String> redNonSSIndices = redIndices.stream()
.map(metadata.getProject()::index) .map(i -> projectResolver.getProjectMetadata(metadata).index(i))
.filter(i -> i.isSearchableSnapshot() == false) .filter(i -> i.isSearchableSnapshot() == false)
.map(im -> im.getIndex().getName()) .map(im -> im.getIndex().getName())
.collect(Collectors.toSet()); .collect(Collectors.toSet());
@ -227,7 +234,7 @@ public class TransportPrevalidateNodeRemovalAction extends TransportMasterNodeRe
) // (Index, ClusterShardHealth) of all red shards ) // (Index, ClusterShardHealth) of all red shards
.map( .map(
redIndexShardHealthTuple -> new ShardId( redIndexShardHealthTuple -> new ShardId(
metadata.getProject().index(redIndexShardHealthTuple.v1()).getIndex(), projectResolver.getProjectMetadata(metadata).index(redIndexShardHealthTuple.v1()).getIndex(),
redIndexShardHealthTuple.v2().getShardId() redIndexShardHealthTuple.v2().getShardId()
) )
) // Convert to ShardId ) // Convert to ShardId

8
x-pack/qa/multi-project/core-rest-tests-with-multiple-projects/build.gradle
View file

@ -40,7 +40,6 @@ tasks.named("yamlRestTest").configure {
'^cluster.desired_balance/10_basic/*', '^cluster.desired_balance/10_basic/*',
'^cluster.health/10_basic/cluster health with closed index', // closed index '^cluster.health/10_basic/cluster health with closed index', // closed index
'^cluster.health/30_indices_options/cluster health with expand_wildcards', // closed index '^cluster.health/30_indices_options/cluster health with expand_wildcards', // closed index
'^cluster.prevalidate_node_removal/*/*',
'^cluster.state/20_filtering/*', '^cluster.state/20_filtering/*',
'^cluster.state/30_expand_wildcards/*', '^cluster.state/30_expand_wildcards/*',
'^cluster.stats/*/*', '^cluster.stats/*/*',
@ -117,7 +116,12 @@ tasks.named("yamlRestTest").configure {
'^synonyms/*/*', '^synonyms/*/*',
'^tsdb/10_settings/*', '^tsdb/10_settings/*',
'^tsdb/30_snapshot/*', '^tsdb/30_snapshot/*',
'^tsdb/80_index_resize/*' '^tsdb/80_index_resize/*',
// The following tests are muted because the functionality that they are testing is not available in a multi-project setup
// The node removal prevalidation is only available for a Stateful deployment.
'^cluster.prevalidate_node_removal/*/*'
]; ];
if (buildParams.isSnapshotBuild() == false) { if (buildParams.isSnapshotBuild() == false) {
blacklist += []; blacklist += [];