-
Notifications
You must be signed in to change notification settings - Fork 24.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Faster access to INITIALIZING/RELOCATING shards (#47817)
Today a couple of allocation deciders iterate through all the shards on a node to find the `INITIALIZING` or `RELOCATING` ones, and this can slow down cluster state updates in clusters with very high-density nodes holding many thousands of shards even if those shards belong to closed or frozen indices. This commit pre-computes the sets of `INITIALIZING` and `RELOCATING` shards to speed up this search. Closes #46941 Relates #48579 Co-authored-by: "hongju.xhj" <hongju.xhj@alibaba-inc.com>
- Loading branch information
1 parent
32d511d
commit 30b0a4e
Showing
3 changed files
with
224 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.cluster.routing; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.common.transport.TransportAddress; | ||
| import org.elasticsearch.index.shard.ShardId; | ||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| import java.net.InetAddress; | ||
|
|
||
| import static java.util.Collections.emptyMap; | ||
| import static java.util.Collections.emptySet; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.hamcrest.Matchers.nullValue; | ||
|
|
||
| public class RoutingNodeTests extends ESTestCase { | ||
| private ShardRouting unassignedShard0 = | ||
| TestShardRouting.newShardRouting("test", 0, "node-1", false, ShardRoutingState.STARTED); | ||
| private ShardRouting initializingShard0 = | ||
| TestShardRouting.newShardRouting("test", 1, "node-1", false, ShardRoutingState.INITIALIZING); | ||
| private ShardRouting relocatingShard0 = | ||
| TestShardRouting.newShardRouting("test", 2, "node-1", "node-2", false, ShardRoutingState.RELOCATING); | ||
| private RoutingNode routingNode; | ||
|
|
||
| @Override | ||
| public void setUp() throws Exception { | ||
| super.setUp(); | ||
| InetAddress inetAddress = InetAddress.getByAddress("name1", new byte[] { (byte) 192, (byte) 168, (byte) 0, (byte) 1}); | ||
| TransportAddress transportAddress = new TransportAddress(inetAddress, randomIntBetween(0, 65535)); | ||
| DiscoveryNode discoveryNode = new DiscoveryNode("name1", "node-1", transportAddress, emptyMap(), emptySet(), Version.CURRENT); | ||
| routingNode = new RoutingNode("node1", discoveryNode, unassignedShard0, initializingShard0, relocatingShard0); | ||
| } | ||
|
|
||
| public void testAdd() { | ||
| ShardRouting initializingShard1 = | ||
| TestShardRouting.newShardRouting("test", 3, "node-1", false, ShardRoutingState.INITIALIZING); | ||
| ShardRouting relocatingShard0 = | ||
| TestShardRouting.newShardRouting("test", 4, "node-1", "node-2",false, ShardRoutingState.RELOCATING); | ||
| routingNode.add(initializingShard1); | ||
| routingNode.add(relocatingShard0); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 3)), equalTo(initializingShard1)); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 4)), equalTo(relocatingShard0)); | ||
| } | ||
|
|
||
| public void testUpdate() { | ||
| ShardRouting startedShard0 = | ||
| TestShardRouting.newShardRouting("test", 0, "node-1", false, ShardRoutingState.STARTED); | ||
| ShardRouting startedShard1 = | ||
| TestShardRouting.newShardRouting("test", 1, "node-1", "node-2",false, ShardRoutingState.RELOCATING); | ||
| ShardRouting startedShard2 = | ||
| TestShardRouting.newShardRouting("test", 2, "node-1", false, ShardRoutingState.INITIALIZING); | ||
| routingNode.update(unassignedShard0, startedShard0); | ||
| routingNode.update(initializingShard0, startedShard1); | ||
| routingNode.update(relocatingShard0, startedShard2); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 0)).state(), | ||
| equalTo(ShardRoutingState.STARTED)); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 1)).state(), | ||
| equalTo(ShardRoutingState.RELOCATING)); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 2)).state(), | ||
| equalTo(ShardRoutingState.INITIALIZING)); | ||
| } | ||
|
|
||
| public void testRemove() { | ||
| routingNode.remove(unassignedShard0); | ||
| routingNode.remove(initializingShard0); | ||
| routingNode.remove(relocatingShard0); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 0)), is(nullValue())); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 1)), is(nullValue())); | ||
| assertThat(routingNode.getByShardId(new ShardId("test", IndexMetaData.INDEX_UUID_NA_VALUE, 2)), is(nullValue())); | ||
| } | ||
|
|
||
| public void testNumberOfShardsWithState() { | ||
| assertThat(routingNode.numberOfShardsWithState(ShardRoutingState.INITIALIZING, ShardRoutingState.STARTED), equalTo(2)); | ||
| assertThat(routingNode.numberOfShardsWithState(ShardRoutingState.STARTED), equalTo(1)); | ||
| assertThat(routingNode.numberOfShardsWithState(ShardRoutingState.RELOCATING), equalTo(1)); | ||
| assertThat(routingNode.numberOfShardsWithState(ShardRoutingState.INITIALIZING), equalTo(1)); | ||
| } | ||
|
|
||
| public void testShardsWithState() { | ||
| assertThat(routingNode.shardsWithState(ShardRoutingState.INITIALIZING, ShardRoutingState.STARTED).size(), equalTo(2)); | ||
| assertThat(routingNode.shardsWithState(ShardRoutingState.STARTED).size(), equalTo(1)); | ||
| assertThat(routingNode.shardsWithState(ShardRoutingState.RELOCATING).size(), equalTo(1)); | ||
| assertThat(routingNode.shardsWithState(ShardRoutingState.INITIALIZING).size(), equalTo(1)); | ||
| } | ||
|
|
||
| public void testShardsWithStateInIndex() { | ||
| assertThat(routingNode.shardsWithState("test", ShardRoutingState.INITIALIZING, ShardRoutingState.STARTED).size(), equalTo(2)); | ||
| assertThat(routingNode.shardsWithState("test", ShardRoutingState.STARTED).size(), equalTo(1)); | ||
| assertThat(routingNode.shardsWithState("test", ShardRoutingState.RELOCATING).size(), equalTo(1)); | ||
| assertThat(routingNode.shardsWithState("test", ShardRoutingState.INITIALIZING).size(), equalTo(1)); | ||
| } | ||
|
|
||
| public void testNumberOfOwningShards() { | ||
| assertThat(routingNode.numberOfOwningShards(), equalTo(2)); | ||
| } | ||
|
|
||
| } |