Skip to content

[BUGFIX] Metadata adjustments should be based on the cluster state after joining nodes. #19904

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[BUGFIX] Metadata adjustments should be based on the cluster state after joining nodes. #19904

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
13 changes: 8 additions & 5 deletions server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo
}
results.success(joinTask);
}

// adjust the metadata based on node join state
ClusterState nodeJoinState = newState.nodes(nodesBuilder).build();
RepositoriesMetadata repositoriesMetadata = new RepositoriesMetadata(new ArrayList<>(repositories.values()));
if (nodesChanged) {
rerouteService.reroute(
Expand All @@ -278,15 +281,15 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo

// if VotingConfigExclusions did get updated
if (newVotingConfigExclusions.equals(currentVotingConfigExclusions) == false) {
CoordinationMetadata.Builder coordMetadataBuilder = CoordinationMetadata.builder(currentState.coordinationMetadata())
CoordinationMetadata.Builder coordMetadataBuilder = CoordinationMetadata.builder(nodeJoinState.coordinationMetadata())
.clearVotingConfigExclusions();
newVotingConfigExclusions.forEach(coordMetadataBuilder::addVotingConfigExclusion);
Metadata newMetadata = Metadata.builder(currentState.metadata())
Metadata newMetadata = Metadata.builder(nodeJoinState.metadata())
.coordinationMetadata(coordMetadataBuilder.build())
.build();
return results.build(
allocationService.adaptAutoExpandReplicas(
newState.nodes(nodesBuilder)
new ClusterState.Builder(nodeJoinState)
.metadata(updateMetadataWithRepositoriesMetadata(newMetadata, repositoriesMetadata))
.build()
)
Expand All @@ -296,7 +299,7 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo

return results.build(
allocationService.adaptAutoExpandReplicas(
newState.nodes(nodesBuilder)
new ClusterState.Builder(nodeJoinState)
.metadata(updateMetadataWithRepositoriesMetadata(currentState.metadata(), repositoriesMetadata))
.build()
)
Expand All @@ -305,7 +308,7 @@ public ClusterTasksResult<Task> execute(ClusterState currentState, List<Task> jo
// we must return a new cluster state instance to force publishing. This is important
// for the joining node to finalize its join and set us as a cluster-manager
return results.build(
newState.metadata(updateMetadataWithRepositoriesMetadata(currentState.metadata(), repositoriesMetadata)).build()
new ClusterState.Builder(nodeJoinState).metadata(updateMetadataWithRepositoriesMetadata(currentState.metadata(), repositoriesMetadata)).build()
);
}
}
Expand Down
Loading