Skip to content

Replace RoutingTable#shardsWithState(...) with RoutingNodes#unassigned(...) #78931

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 4 commits into from
Oct 12, 2021
Merged

Replace RoutingTable#shardsWithState(...) with RoutingNodes#unassigned(...) #78931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dc345f
Replace RoutingTable#shardsWithState(...) with RoutingNodes#shardsWit…
martijnvg Oct 11, 2021
9f88b6e
Use `RoutingNodes#unassigned()` instead
martijnvg Oct 11, 2021
8da23f3
Merge remote-tracking branch 'es/master' into replace_routing_table_s…
martijnvg Oct 11, 2021
343882f
removed unused import
martijnvg Oct 11, 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
5 changes: 2 additions & 3 deletions server/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ public long getRemainingDelay(
*/
public static int getNumberOfDelayedUnassigned(ClusterState state) {
int count = 0;
for (ShardRouting shard : state.routingTable().shardsWithState(ShardRoutingState.UNASSIGNED)) {
for (ShardRouting shard : state.getRoutingNodes().unassigned()) {
if (shard.unassignedInfo().isDelayed()) {
count++;
}
Expand All @@ -461,9 +461,8 @@ public static int getNumberOfDelayedUnassigned(ClusterState state) {
*/
public static long findNextDelayedAllocation(long currentNanoTime, ClusterState state) {
Metadata metadata = state.metadata();
RoutingTable routingTable = state.routingTable();
long nextDelayNanos = Long.MAX_VALUE;
for (ShardRouting shard : routingTable.shardsWithState(ShardRoutingState.UNASSIGNED)) {
for (ShardRouting shard : state.getRoutingNodes().unassigned()) {
UnassignedInfo unassignedInfo = shard.unassignedInfo();
if (unassignedInfo.isDelayed()) {
Settings indexSettings = metadata.index(shard.index()).getSettings();
Expand Down
3 changes: 1 addition & 2 deletions server/src/main/java/org/elasticsearch/snapshots/InternalSnapshotsInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.elasticsearch.cluster.routing.RecoverySource;
import org.elasticsearch.cluster.routing.RerouteService;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.routing.ShardRoutingState;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.collect.ImmutableOpenMap;
Expand Down Expand Up @@ -320,7 +319,7 @@ int numberOfKnownSnapshotShardSizes() {

private static Set<SnapshotShard> listOfSnapshotShards(final ClusterState state) {
final Set<SnapshotShard> snapshotShards = new HashSet<>();
for (ShardRouting shardRouting : state.routingTable().shardsWithState(ShardRoutingState.UNASSIGNED)) {
for (ShardRouting shardRouting : state.getRoutingNodes().unassigned()) {
if (shardRouting.primary() && shardRouting.recoverySource().getType() == RecoverySource.Type.SNAPSHOT) {
final RecoverySource.SnapshotRecoverySource snapshotRecoverySource = (RecoverySource.SnapshotRecoverySource) shardRouting
.recoverySource();
Expand Down