simulate disk usage during balance calculation#90061
Merged
idegtiarenko merged 22 commits intoelastic:feature/desired-balance-allocatorfrom Oct 5, 2022
Merged
simulate disk usage during balance calculation#90061idegtiarenko merged 22 commits intoelastic:feature/desired-balance-allocatorfrom
idegtiarenko merged 22 commits intoelastic:feature/desired-balance-allocatorfrom
Conversation
idegtiarenko
commented
Sep 14, 2022
| this.totalBytes = totalBytes; | ||
| this.path = path; | ||
| this.totalBytes = totalBytes; | ||
| this.freeBytes = freeBytes; |
Contributor
Author
There was a problem hiding this comment.
Reordered to match constructor args order. Will port it to the main branch separately later.
idegtiarenko
commented
Sep 14, 2022
| // relocation | ||
| increaseTargetDiskUsage(shard.relocatingNodeId(), size); | ||
| decreaseSourceDiskUsage(shard.currentNodeId(), size); | ||
| // TODO update shard data path? |
Contributor
Author
There was a problem hiding this comment.
routingToDataPath is keyed by a ShardRouting. If we want to update it as well then we need to also pass the state of the shard after it was initialized here.
23 tasks
idegtiarenko
commented
Sep 15, 2022
| final Function<ShardRouting, Long> shardSizeFunctionCopy = MockInternalClusterInfoService.this.shardSizeFunction; | ||
| if (shardSizeFunctionCopy == null) { | ||
| return super.getShardSize(shardRouting); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
This faked only a getter call rather then entire underlying map that is used for a calculations in ClusterInfoSimulator. Updating entire ShardStats in adjustShardStats similar to adjustNodesStats. This should fix failures in MockDiskUsagesIT.
Contributor
Author
There was a problem hiding this comment.
This commit is ported to the master branch: https://github.com/elastic/elasticsearch/pull/90092/files to minimize the diff
Contributor
Author
|
@elasticmachine please run elasticsearch-ci/bwc |
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
…sage # Conflicts: # server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java # server/src/main/java/org/elasticsearch/cluster/DiskUsage.java
DaveCTurner
reviewed
Sep 20, 2022
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
Looks good, I left some comments about tests.
server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { |
Member
There was a problem hiding this comment.
We should use EqualsHashCodeTestUtils.checkEqualsAndHashCode to test this in ClusterInfoTests. Alternatively add a dedicated AbstractWireSerializingTestCase derivative for ClusterInfo which would cover equals and hashcode as well as replacing ClusterInfoTests#testSerialization.
Contributor
Author
There was a problem hiding this comment.
Should the change to equals/hashCode and their tests be ported to main separately?
| final var changes = routingAllocation.changes(); | ||
| final var knownNodeIds = routingAllocation.nodes().stream().map(DiscoveryNode::getId).collect(Collectors.toSet()); | ||
| final var unassignedPrimaries = new HashSet<ShardId>(); | ||
| final var clusterInfoSimulator = new ClusterInfoSimulator(routingAllocation.clusterInfo()); |
Member
There was a problem hiding this comment.
Could we enhance DesiredBalanceComputerTests to verify we're accounting for disk usage in all the right places?
…sage # Conflicts: # server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
DaveCTurner
reviewed
Sep 21, 2022
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
Hmm I don't think we're really testing that the DesiredBalanceComputer is using the ClusterInfoSimulator correctly. Specifically, DesiredBalanceComputerTests all pass even if I remove all mention of the simulator:
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
index 50bde0b40dd..f1a40911ba1 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
@@ -10,7 +10,6 @@ package org.elasticsearch.cluster.routing.allocation.allocator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.elasticsearch.cluster.ClusterInfoSimulator;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.routing.RoutingNodes;
import org.elasticsearch.cluster.routing.ShardRouting;
@@ -57,7 +56,6 @@ public class DesiredBalanceComputer {
final var routingNodes = routingAllocation.routingNodes();
final var ignoredShards = new HashSet<>(desiredBalanceInput.ignoredShards());
final var changes = routingAllocation.changes();
- final var clusterInfoSimulator = new ClusterInfoSimulator(routingAllocation.clusterInfo());
if (routingNodes.isEmpty()) {
return new DesiredBalance(desiredBalanceInput.index(), Map.of());
@@ -67,7 +65,6 @@ public class DesiredBalanceComputer {
for (final var routingNode : routingNodes) {
for (final var shardRouting : routingNode) {
if (shardRouting.initializing()) {
- clusterInfoSimulator.simulate(shardRouting);
routingNodes.startShard(logger, shardRouting, changes, 0L);
}
}
@@ -128,7 +125,6 @@ public class DesiredBalanceComputer {
assert shardRouting.started();
if (targetNodesIterator.hasNext()) {
ShardRouting shardToRelocate = routingNodes.relocateShard(shardRouting, targetNodesIterator.next(), 0L, changes).v2();
- clusterInfoSimulator.simulate(shardToRelocate);
routingNodes.startShard(logger, shardToRelocate, changes, 0L);
} else {
break;
@@ -154,7 +150,6 @@ public class DesiredBalanceComputer {
if (nodeIds != null && nodeIds.isEmpty() == false) {
final String nodeId = nodeIds.removeFirst();
ShardRouting shardToInitialized = unassignedPrimaryIterator.initialize(nodeId, null, 0L, changes);
- clusterInfoSimulator.simulate(shardToInitialized);
routingNodes.startShard(logger, shardToInitialized, changes, 0L);
}
}
@@ -168,7 +163,6 @@ public class DesiredBalanceComputer {
if (nodeIds != null && nodeIds.isEmpty() == false) {
final String nodeId = nodeIds.removeFirst();
ShardRouting shardToInitialize = unassignedReplicaIterator.initialize(nodeId, null, 0L, changes);
- clusterInfoSimulator.simulate(shardToInitialize);
routingNodes.startShard(logger, shardToInitialize, changes, 0L);
}
}
@@ -212,7 +206,6 @@ public class DesiredBalanceComputer {
// TODO test that we reset ignored shards properly
}
- routingAllocation.setSimulatedClusterInfo(clusterInfoSimulator.getClusterInfo());
logger.trace("running delegate allocator");
delegateAllocator.allocate(routingAllocation);
assert routingNodes.unassigned().size() == 0; // any unassigned shards should now be ignored
@@ -222,7 +215,6 @@ public class DesiredBalanceComputer {
for (final var shardRouting : routingNode) {
if (shardRouting.initializing()) {
hasChanges = true;
- clusterInfoSimulator.simulate(shardRouting);
routingNodes.startShard(logger, shardRouting, changes, 0L);
logger.trace("starting shard {}", shardRouting);
}
server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java
Outdated
Show resolved
Hide resolved
Co-authored-by: David Turner <david.turner@elastic.co>
Co-authored-by: David Turner <david.turner@elastic.co>
Contributor
Author
|
@elasticsearchmachine please run elasticsearch-ci/bwc |
DaveCTurner
approved these changes
Oct 3, 2022
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
LGTM, but I would like a follow-up to extend the tests to verify the usage of the clusterInfoSimulator in the preparatory steps of the DesiredBalanceComputer. Specifically, the tests all still pass even with these lines removed:
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
index 50bde0b40dd..e3784be6551 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java
@@ -67,7 +67,6 @@ public class DesiredBalanceComputer {
for (final var routingNode : routingNodes) {
for (final var shardRouting : routingNode) {
if (shardRouting.initializing()) {
- clusterInfoSimulator.simulate(shardRouting);
routingNodes.startShard(logger, shardRouting, changes, 0L);
}
}
@@ -128,7 +127,6 @@ public class DesiredBalanceComputer {
assert shardRouting.started();
if (targetNodesIterator.hasNext()) {
ShardRouting shardToRelocate = routingNodes.relocateShard(shardRouting, targetNodesIterator.next(), 0L, changes).v2();
- clusterInfoSimulator.simulate(shardToRelocate);
routingNodes.startShard(logger, shardToRelocate, changes, 0L);
} else {
break;
@@ -154,7 +152,6 @@ public class DesiredBalanceComputer {
if (nodeIds != null && nodeIds.isEmpty() == false) {
final String nodeId = nodeIds.removeFirst();
ShardRouting shardToInitialized = unassignedPrimaryIterator.initialize(nodeId, null, 0L, changes);
- clusterInfoSimulator.simulate(shardToInitialized);
routingNodes.startShard(logger, shardToInitialized, changes, 0L);
}
}
@@ -168,7 +165,6 @@ public class DesiredBalanceComputer {
if (nodeIds != null && nodeIds.isEmpty() == false) {
final String nodeId = nodeIds.removeFirst();
ShardRouting shardToInitialize = unassignedReplicaIterator.initialize(nodeId, null, 0L, changes);
- clusterInfoSimulator.simulate(shardToInitialize);
routingNodes.startShard(logger, shardToInitialize, changes, 0L);
}
}…sage # Conflicts: # server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputer.java # server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java
Contributor
Author
|
@elasticsearchmachine please run elasticsearch-ci/part-1 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.