Skip to content

Remove unnecessary shuffle in unassigned shards allocation. #65172

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 8 commits into from
Nov 23, 2021
Merged

Remove unnecessary shuffle in unassigned shards allocation. #65172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f619dfd
Remove unnecessary shuffle in unassigned shards allocation.
howardhuanghua Nov 18, 2020
031ae97
Merge remote-tracking branch 'upstream/master' into remove_shuffle
howardhuanghua Dec 21, 2020
2666197
Merge master
howardhuanghua Nov 18, 2021
96203f9
revert unchanged
howardhuanghua Nov 18, 2021
3e86686
remove unused import
howardhuanghua Nov 18, 2021
769202e
Merge remote-tracking branch 'origin' into remove_shuffle
howardhuanghua Nov 22, 2021
11ebe12
Merge remote-tracking branch 'origin' into remove_shuffle
howardhuanghua Nov 23, 2021
0219f58
Merge remote-tracking branch 'origin' into remove_shuffle
howardhuanghua Nov 23, 2021
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
6 changes: 0 additions & 6 deletions server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.elasticsearch.cluster.routing.UnassignedInfo.AllocationStatus;
import org.elasticsearch.cluster.routing.allocation.ExistingShardsAllocator;
import org.elasticsearch.cluster.service.MasterService;
import org.elasticsearch.common.Randomness;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.Tuple;
import org.elasticsearch.index.Index;
Expand Down Expand Up @@ -1068,11 +1067,6 @@ public boolean isIgnoredEmpty() {
return ignored.isEmpty();
}

public void shuffle() {
nodes.ensureMutable();
Randomness.shuffle(unassigned);
}

/**
* Drains all unassigned shards and returns it.
* This method will not drain ignored shards.
Expand Down
8 changes: 0 additions & 8 deletions server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ public ClusterState applyStartedShards(ClusterState clusterState, List<ShardRout
return clusterState;
}
RoutingNodes routingNodes = getMutableRoutingNodes(clusterState);
// shuffle the unassigned shards, just so we won't have things like poison failed shards
routingNodes.unassigned().shuffle();
RoutingAllocation allocation = new RoutingAllocation(
allocationDeciders,
routingNodes,
Expand Down Expand Up @@ -197,8 +195,6 @@ public ClusterState applyFailedShards(
ClusterState tmpState = IndexMetadataUpdater.removeStaleIdsWithoutRoutings(clusterState, staleShards, logger);

RoutingNodes routingNodes = getMutableRoutingNodes(tmpState);
// shuffle the unassigned shards, just so we won't have things like poison failed shards
routingNodes.unassigned().shuffle();
long currentNanoTime = currentNanoTime();
RoutingAllocation allocation = new RoutingAllocation(
allocationDeciders,
Expand Down Expand Up @@ -274,8 +270,6 @@ public ClusterState applyFailedShards(
*/
public ClusterState disassociateDeadNodes(ClusterState clusterState, boolean reroute, String reason) {
RoutingNodes routingNodes = getMutableRoutingNodes(clusterState);
// shuffle the unassigned shards, just so we won't have things like poison failed shards
routingNodes.unassigned().shuffle();
RoutingAllocation allocation = new RoutingAllocation(
allocationDeciders,
routingNodes,
Expand Down Expand Up @@ -479,8 +473,6 @@ public ClusterState reroute(ClusterState clusterState, String reason) {
ClusterState fixedClusterState = adaptAutoExpandReplicas(clusterState);

RoutingNodes routingNodes = getMutableRoutingNodes(fixedClusterState);
// shuffle the unassigned shards, just so we won't have things like poison failed shards
routingNodes.unassigned().shuffle();
RoutingAllocation allocation = new RoutingAllocation(
allocationDeciders,
routingNodes,
Expand Down