Skip to content
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

Improve data_tier allocation explanation message #105858

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Improve data_tier allocation explanation message #105858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8a0467
Improve data_tier allocation explanation message
idegtiarenko Mar 1, 2024
d27ce4c
Merge branch 'main' into data_tier_allocation_explain
idegtiarenko Mar 5, 2024
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
26 changes: 9 additions & 17 deletions ...in/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDecider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,18 @@ public static Decision shouldFilter(
);
if (tier.isPresent()) {
String tierName = tier.get();
if (allocationAllowed(tierName, node)) {
if (allocation.debugDecision()) {
return debugYesAllowed(allocation, tierPreference, tierName);
}
return Decision.YES;
assert Strings.hasText(tierName) : "tierName must be not null and non-empty, but was [" + tierName + "]";
if (node.hasRole(DiscoveryNodeRole.DATA_ROLE.roleName())) {
return allocation.debugDecision()
? debugYesAllowed(allocation, tierPreference, DiscoveryNodeRole.DATA_ROLE.roleName())
: Decision.YES;
}
if (allocation.debugDecision()) {
return debugNoRequirementsNotMet(allocation, tierPreference, tierName);
if (node.hasRole(tierName)) {
return allocation.debugDecision() ? debugYesAllowed(allocation, tierPreference, tierName) : Decision.YES;
}
return Decision.NO;
return allocation.debugDecision() ? debugNoRequirementsNotMet(allocation, tierPreference, tierName) : Decision.NO;
}
if (allocation.debugDecision()) {
return debugNoNoNodesAvailable(allocation, tierPreference);
}
return Decision.NO;
return allocation.debugDecision() ? debugNoNoNodesAvailable(allocation, tierPreference) : Decision.NO;
}

private static Decision debugNoNoNodesAvailable(RoutingAllocation allocation, List<String> tierPreference) {
Expand Down Expand Up @@ -278,11 +275,6 @@ static boolean tierNodesPresentConsideringRemovals(String singleTier, DiscoveryN
return false;
}

public static boolean allocationAllowed(String tierName, DiscoveryNode node) {
assert Strings.hasText(tierName) : "tierName must be not null and non-empty, but was [" + tierName + "]";
return node.hasRole(DiscoveryNodeRole.DATA_ROLE.roleName()) || node.hasRole(tierName);
}

public static boolean allocationAllowed(String tierName, Set<DiscoveryNodeRole> roles) {
assert Strings.hasText(tierName) : "tierName must be not null and non-empty, but was [" + tierName + "]";

Expand Down
9 changes: 9 additions & 0 deletions ...va/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,16 @@ public void testIndexPrefer() {
)
);
}
}
{
final var state = clusterStateWithIndexAndNodes("data_warm", DiscoveryNodes.builder().add(DATA_NODE).build(), null);

assertAllocationDecision(
state,
DATA_NODE,
Decision.Type.YES,
"index has a preference for tiers [data_warm] and node has tier [data]"
);
}
}

Expand Down