Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ALLOCATION] Weight deltas must be absolute deltas
In some situations the shard balanceing weight delta becomes negative. Yet, a negative delta is always treated as `well balanced` which is wrong. I wasn't able to reproduce the issue in any way other than useing the real world data from issue #9023. This commit adds a fix for absolute deltas as well as a base test class that allows to build tests or simulations from the cat API output. Closes #9023
- Loading branch information
Showing
8 changed files
with
328 additions
and
53 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
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
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
97 changes: 97 additions & 0 deletions
97
src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.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,97 @@ | ||
| /* | ||
| * 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.allocation; | ||
|
|
||
| import org.apache.lucene.util.TestUtil; | ||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.cluster.metadata.MetaData; | ||
| import org.elasticsearch.cluster.routing.IndexShardRoutingTable; | ||
| import org.elasticsearch.cluster.routing.RoutingTable; | ||
| import org.elasticsearch.cluster.routing.ShardRouting; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; | ||
| import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; | ||
|
|
||
| /** | ||
| * see issue #9023 | ||
| */ | ||
| public class BalanceUnbalancedClusterTest extends CatAllocationTestBase { | ||
|
|
||
| @Override | ||
| protected Path getCatPath() throws IOException { | ||
| Path tmp = newTempDir().toPath(); | ||
| TestUtil.unzip(getResource("/org/elasticsearch/cluster/routing/issue_9023.zip"), tmp.toFile()); | ||
| return tmp.resolve("issue_9023"); | ||
| } | ||
|
|
||
| @Override | ||
| protected ClusterState allocateNew(ClusterState state) { | ||
| String index = "tweets-2014-12-29:00"; | ||
| AllocationService strategy = createAllocationService(settingsBuilder() | ||
| .build()); | ||
| MetaData metaData = MetaData.builder(state.metaData()) | ||
| .put(IndexMetaData.builder(index).numberOfShards(5).numberOfReplicas(1)) | ||
| .build(); | ||
|
|
||
| RoutingTable routingTable = RoutingTable.builder(state.routingTable()) | ||
| .addAsNew(metaData.index(index)) | ||
| .build(); | ||
|
|
||
| ClusterState clusterState = ClusterState.builder(state).metaData(metaData).routingTable(routingTable).build(); | ||
| routingTable = strategy.reroute(clusterState).routingTable(); | ||
| clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build(); | ||
| while (true) { | ||
| if (routingTable.shardsWithState(INITIALIZING).isEmpty()) { | ||
| break; | ||
| } | ||
| routingTable = strategy.applyStartedShards(clusterState, routingTable.shardsWithState(INITIALIZING)).routingTable(); | ||
| clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build(); | ||
| } | ||
| Map<String, Integer> counts = new HashMap<>(); | ||
| for (IndexShardRoutingTable table : routingTable.index(index)) { | ||
| for (ShardRouting r : table) { | ||
| String s = r.currentNodeId(); | ||
| Integer count = counts.get(s); | ||
| if (count == null) { | ||
| count = 0; | ||
| } | ||
| count++; | ||
| counts.put(s, count); | ||
| } | ||
| } | ||
| for (Map.Entry<String, Integer> count : counts.entrySet()) { | ||
| // we have 10 shards and 4 nodes so 2 nodes have 3 shards and 2 nodes have 2 shards | ||
| assertTrue("Node: " + count.getKey() + " has shard mismatch: " + count.getValue(), count.getValue() >= 2); | ||
| assertTrue("Node: " + count.getKey() + " has shard mismatch: " + count.getValue(), count.getValue() <= 3); | ||
|
|
||
| } | ||
| return clusterState; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.