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

Cache DiscoveryNode#trimTier Result #80179

Merged
merged 2 commits into from
Nov 2, 2021
Merged

Cache DiscoveryNode#trimTier Result #80179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b92d48b
Cache `DiscoveryNode#trimTier` Result
original-brownbear Nov 2, 2021
cc60c40
faster
original-brownbear Nov 2, 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
36 changes: 16 additions & 20 deletions server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.Map;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;

public class DiscoveryNodeFilters {

Expand Down Expand Up @@ -52,7 +51,7 @@ public static DiscoveryNodeFilters buildFromKeyValue(OpType opType, Map<String,
Map<String, String[]> bFilters = new HashMap<>();
for (Map.Entry<String, String> entry : filters.entrySet()) {
String[] values = Strings.tokenizeToStringArray(entry.getValue(), ",");
if (values.length > 0) {
if (values.length > 0 && entry.getKey() != null) {
bFilters.put(entry.getKey(), values);
}
}
Expand All @@ -66,9 +65,13 @@ public static DiscoveryNodeFilters buildFromKeyValue(OpType opType, Map<String,

private final OpType opType;

DiscoveryNodeFilters(OpType opType, Map<String, String[]> filters) {
@Nullable
private final DiscoveryNodeFilters withoutTierPreferences;

private DiscoveryNodeFilters(OpType opType, Map<String, String[]> filters) {
this.opType = opType;
this.filters = filters;
this.filters = Map.copyOf(filters);
this.withoutTierPreferences = doTrimTier(this);
}

private boolean matchByIP(String[] values, @Nullable String hostIp, @Nullable String publishIp) {
Expand All @@ -89,24 +92,17 @@ private boolean matchByIP(String[] values, @Nullable String hostIp, @Nullable St
*/
@Nullable
public static DiscoveryNodeFilters trimTier(@Nullable DiscoveryNodeFilters original) {
if (original == null) {
return null;
}

Map<String, String[]> newFilters = original.filters.entrySet()
.stream()
// Remove all entries that use "_tier_preference", as these will be handled elsewhere
.filter(entry -> {
String attr = entry.getKey();
return attr != null && attr.equals("_tier_preference") == false;
})
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
return original == null ? null : original.withoutTierPreferences;
}

if (newFilters.size() == 0) {
return null;
} else {
return new DiscoveryNodeFilters(original.opType, newFilters);
private static DiscoveryNodeFilters doTrimTier(DiscoveryNodeFilters original) {
if (original.filters.containsKey("_tier_preference") == false) {
return original;
}
final Map<String, String[]> newFilters = new HashMap<>(original.filters);
final String[] removed = newFilters.remove("_tier_preference");
assert removed != null;
return newFilters.isEmpty() ? null : new DiscoveryNodeFilters(original.opType, newFilters);
}

public boolean match(DiscoveryNode node) {
Expand Down