diff --git a/docs/configuration/index.md b/docs/configuration/index.md index 4899518144fc..427946f9bc3f 100644 --- a/docs/configuration/index.md +++ b/docs/configuration/index.md @@ -1789,8 +1789,10 @@ These Broker configurations can be defined in the `broker/runtime.properties` fi |Property|Possible Values|Description|Default| |--------|---------------|-----------|-------| |`druid.broker.balancer.type`|`random`, `connectionCount`|Determines how the broker balances connections to Historical processes. `random` choose randomly, `connectionCount` picks the process with the fewest number of active connections to|`random`| -|`druid.broker.select.tier`|`highestPriority`, `lowestPriority`, `custom`|If segments are cross-replicated across tiers in a cluster, you can tell the broker to prefer to select segments in a tier with a certain priority.|`highestPriority`| +|`druid.broker.select.tier`|`highestPriority`, `lowestPriority`, `custom`, `preferred`|If segments are cross-replicated across tiers in a cluster, you can tell the broker to prefer to select segments in a tier with a certain priority.|`highestPriority`| |`druid.broker.select.tier.custom.priorities`|An array of integer priorities, such as `[-1, 0, 1, 2]`|Select servers in tiers with a custom priority list.|The config only has effect if `druid.broker.select.tier` is set to `custom`. If `druid.broker.select.tier` is set to `custom` but this config is not specified, the effect is the same as `druid.broker.select.tier` set to `highestPriority`. Any of the integers in this config can be ignored if there's no corresponding tiers with such priorities. Tiers with priorities explicitly specified in this config always have higher priority than those not and those not specified fall back to use `highestPriority` strategy among themselves.| +|`druid.broker.select.tier.preferred.tier`| The preferred tier name. E.g., `_default_tier` | A non-empty value that specifies the preferred tier in which historical servers will be picked up for queries. If there are not enough historical servers from the preferred tier, servers from other tiers (if there are any) will be selected. This config only has effect if `druid.broker.select.tier` is set to `preferred` | null | +|`druid.broker.select.tier.preferred.priority`| `highest`, `lowest` | If there are multiple candidates in a preferred tier, specifies the priority to pick up candidates. By default, the higher priority a historical, the higher chances it will be picked up. This config only has effect if `druid.broker.select.tier` is set to `preferred`| `highest` | ##### Query prioritization and laning diff --git a/server/src/main/java/org/apache/druid/client/selector/AbstractTierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/AbstractTierSelectorStrategy.java index 59a611df30ff..1821245cbf30 100644 --- a/server/src/main/java/org/apache/druid/client/selector/AbstractTierSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/AbstractTierSelectorStrategy.java @@ -34,7 +34,7 @@ */ public abstract class AbstractTierSelectorStrategy implements TierSelectorStrategy { - private final ServerSelectorStrategy serverSelectorStrategy; + protected final ServerSelectorStrategy serverSelectorStrategy; public AbstractTierSelectorStrategy(ServerSelectorStrategy serverSelectorStrategy) { diff --git a/server/src/main/java/org/apache/druid/client/selector/PreferredTierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/PreferredTierSelectorStrategy.java new file mode 100644 index 000000000000..8287830d0c52 --- /dev/null +++ b/server/src/main/java/org/apache/druid/client/selector/PreferredTierSelectorStrategy.java @@ -0,0 +1,114 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.druid.client.selector; + + +import com.fasterxml.jackson.annotation.JacksonInject; +import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap; +import org.apache.druid.client.QueryableDruidServer; +import org.apache.druid.java.util.common.IAE; +import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.query.Query; +import org.apache.druid.timeline.DataSegment; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class PreferredTierSelectorStrategy extends AbstractTierSelectorStrategy +{ + private static final Logger log = new Logger(PreferredTierSelectorStrategy.class); + + private final String preferredTier; + private final TierSelectorStrategy priorityStrategy; + + public PreferredTierSelectorStrategy( + @JacksonInject ServerSelectorStrategy serverSelectorStrategy, + @JacksonInject PreferredTierSelectorStrategyConfig config + ) + { + super(serverSelectorStrategy); + this.preferredTier = config.getTier(); + + if (config.getPriority() == null) { + this.priorityStrategy = new HighestPriorityTierSelectorStrategy(serverSelectorStrategy); + } else { + if ("highest".equalsIgnoreCase(config.getPriority())) { + this.priorityStrategy = new HighestPriorityTierSelectorStrategy(serverSelectorStrategy); + } else if ("lowest".equalsIgnoreCase(config.getPriority())) { + this.priorityStrategy = new LowestPriorityTierSelectorStrategy(serverSelectorStrategy); + } else { + throw new IAE("druid.broker.select.tier.preferred.priority must be either 'highest' or 'lowest'"); + } + } + } + + @Override + public Comparator getComparator() + { + return priorityStrategy.getComparator(); + } + + @Override + public List pick( + Query query, + Int2ObjectRBTreeMap> prioritizedServers, + DataSegment segment, + int numServersToPick + ) + { + if (log.isDebugEnabled()) { + log.debug( + "Picking [%d] servers from preferred tier [%s] for segment [%s] with priority [%s]", + numServersToPick, preferredTier, segment.getId(), this.priorityStrategy.getClass().getSimpleName() + ); + } + + Int2ObjectRBTreeMap> preferred = new Int2ObjectRBTreeMap<>(priorityStrategy.getComparator()); + Int2ObjectRBTreeMap> nonPreferred = new Int2ObjectRBTreeMap<>(priorityStrategy.getComparator()); + for (Set priorityServers : prioritizedServers.values()) { + for (QueryableDruidServer server : priorityServers) { + if (preferredTier.equals(server.getServer().getMetadata().getTier())) { + preferred.computeIfAbsent(server.getServer().getPriority(), k -> new HashSet<>()) + .add(server); + } else { + nonPreferred.computeIfAbsent(server.getServer().getPriority(), k -> new HashSet<>()) + .add(server); + } + } + } + + List picks = new ArrayList<>(numServersToPick); + if (!preferred.isEmpty()) { + // If we have preferred servers, pick them first + picks.addAll(priorityStrategy.pick(query, preferred, segment, numServersToPick)); + } + + if (picks.size() < numServersToPick && !nonPreferred.isEmpty()) { + // If we don't have enough preferred servers, pick from the non-preferred ones + int remaining = numServersToPick - picks.size(); + picks.addAll(priorityStrategy.pick(query, nonPreferred, segment, remaining)); + } + + return picks; + } +} diff --git a/server/src/main/java/org/apache/druid/client/selector/PreferredTierSelectorStrategyConfig.java b/server/src/main/java/org/apache/druid/client/selector/PreferredTierSelectorStrategyConfig.java new file mode 100644 index 000000000000..fda56641159c --- /dev/null +++ b/server/src/main/java/org/apache/druid/client/selector/PreferredTierSelectorStrategyConfig.java @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.apache.druid.client.selector; + + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; + +public class PreferredTierSelectorStrategyConfig +{ + @JsonProperty + private String tier; + + /** + * Only two options: high or low + */ + @JsonProperty + private String priority; + + @JsonCreator + public PreferredTierSelectorStrategyConfig( + @JsonProperty("tier") String tier, + @JsonProperty("priority") String priority + ) + { + Preconditions.checkState(tier != null && !tier.isEmpty(), + "druid.broker.select.tier.preferred.tier can't be empty"); + this.tier = tier.trim(); + this.priority = priority; + } + + public String getTier() + { + return tier; + } + + public void setTier(String tier) + { + this.tier = tier; + } + + public String getPriority() + { + return priority; + } + + public void setPriority(String priority) + { + this.priority = priority; + } +} diff --git a/server/src/main/java/org/apache/druid/client/selector/TierSelectorStrategy.java b/server/src/main/java/org/apache/druid/client/selector/TierSelectorStrategy.java index 79d541dcd499..6eae7db4f343 100644 --- a/server/src/main/java/org/apache/druid/client/selector/TierSelectorStrategy.java +++ b/server/src/main/java/org/apache/druid/client/selector/TierSelectorStrategy.java @@ -37,7 +37,8 @@ @JsonSubTypes(value = { @JsonSubTypes.Type(name = "highestPriority", value = HighestPriorityTierSelectorStrategy.class), @JsonSubTypes.Type(name = "lowestPriority", value = LowestPriorityTierSelectorStrategy.class), - @JsonSubTypes.Type(name = "custom", value = CustomTierSelectorStrategy.class) + @JsonSubTypes.Type(name = "custom", value = CustomTierSelectorStrategy.class), + @JsonSubTypes.Type(name = "preferred", value = PreferredTierSelectorStrategy.class), }) public interface TierSelectorStrategy { diff --git a/server/src/test/java/org/apache/druid/client/selector/TierSelectorStrategyTest.java b/server/src/test/java/org/apache/druid/client/selector/TierSelectorStrategyTest.java index 335b0ef7c502..a243d5d0fbfa 100644 --- a/server/src/test/java/org/apache/druid/client/selector/TierSelectorStrategyTest.java +++ b/server/src/test/java/org/apache/druid/client/selector/TierSelectorStrategyTest.java @@ -19,6 +19,7 @@ package org.apache.druid.client.selector; +import com.google.common.collect.ImmutableList; import org.apache.druid.client.DirectDruidClient; import org.apache.druid.client.DruidServer; import org.apache.druid.client.QueryableDruidServer; @@ -42,10 +43,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; public class TierSelectorStrategyTest { - + @Test public void testHighestPriorityTierSelectorStrategyRealtime() { @@ -64,7 +66,7 @@ public void testHighestPriorityTierSelectorStrategyRealtime() highPriority, lowPriority ); } - + @Test public void testHighestPriorityTierSelectorStrategy() { @@ -247,7 +249,7 @@ private void testTierSelectorStrategy( Assert.assertEquals(expectedCandidates, serverSelector.getCandidates(-1, CloneQueryMode.EXCLUDECLONES)); Assert.assertEquals(expectedCandidates.subList(0, 2), serverSelector.getCandidates(2, CloneQueryMode.EXCLUDECLONES)); } - + @Test public void testServerSelectorStrategyDefaults() { @@ -260,17 +262,310 @@ public void testServerSelectorStrategyDefaults() servers.add(p0); RandomServerSelectorStrategy strategy = new RandomServerSelectorStrategy(); Assert.assertEquals(strategy.pick(servers, EasyMock.createMock(DataSegment.class)), p0); - Assert.assertEquals(strategy.pick(EasyMock.createMock(Query.class), servers, EasyMock.createMock(DataSegment.class)), p0); - ServerSelectorStrategy defaultDeprecatedServerSelectorStrategy = new ServerSelectorStrategy() { + Assert.assertEquals( + strategy.pick( + EasyMock.createMock(Query.class), + servers, + EasyMock.createMock(DataSegment.class) + ), p0 + ); + ServerSelectorStrategy defaultDeprecatedServerSelectorStrategy = new ServerSelectorStrategy() + { @Override - public List pick(@Nullable Query query, Set servers, DataSegment segment, - int numServersToPick) + public List pick( + @Nullable Query query, Set servers, DataSegment segment, + int numServersToPick + ) { return strategy.pick(servers, segment, numServersToPick); } }; - Assert.assertEquals(defaultDeprecatedServerSelectorStrategy.pick(servers, EasyMock.createMock(DataSegment.class)), p0); - Assert.assertEquals(defaultDeprecatedServerSelectorStrategy.pick(servers, EasyMock.createMock(DataSegment.class), 1).get(0), p0); + Assert.assertEquals( + defaultDeprecatedServerSelectorStrategy.pick(servers, EasyMock.createMock(DataSegment.class)), + p0 + ); + Assert.assertEquals( + defaultDeprecatedServerSelectorStrategy.pick(servers, EasyMock.createMock(DataSegment.class), 1) + .get(0), p0 + ); } + /** + * Tests the PreferredTierSelectorStrategy with various configurations and expected selections. + * It verifies + * 1. The preferred tier is respected when picking a server. + * 2. When getting all servers, the preferred tier is ignored, and the returned list is sorted by priority. + * 3. When getting a limited number of candidates, it returns the top N servers with the preferred tier first. + */ + private void testPreferredTierSelectorStrategy( + PreferredTierSelectorStrategy tierSelectorStrategy, + QueryableDruidServer... expectedSelection + ) + { + final ServerSelector serverSelector = new ServerSelector( + new DataSegment( + "test", + Intervals.of("2013-01-01/2013-01-02"), + DateTimes.of("2013-01-01").toString(), + new HashMap<>(), + new ArrayList<>(), + new ArrayList<>(), + NoneShardSpec.instance(), + 0, + 0L + ), + tierSelectorStrategy, + HistoricalFilter.IDENTITY_FILTER + ); + + List servers = new ArrayList<>(Arrays.asList(expectedSelection)); + + List expectedCandidates = new ArrayList<>(); + for (QueryableDruidServer server : servers) { + expectedCandidates.add(server.getServer().getMetadata()); + } + for (QueryableDruidServer server : servers) { + serverSelector.addServerAndUpdateSegment(server, serverSelector.getSegment()); + } + + // Verify that the preferred tier is respected when picking a server + Assert.assertEquals(expectedSelection[0], serverSelector.pick(null, CloneQueryMode.EXCLUDECLONES)); + Assert.assertEquals(expectedSelection[0], serverSelector.pick(EasyMock.createMock(Query.class), CloneQueryMode.EXCLUDECLONES)); + + // Verify that when getting all severs, the preferred tier is ignored, the returned list is sorted by priority + List allServers = new ArrayList<>(expectedCandidates); + allServers.sort((o1, o2) -> tierSelectorStrategy.getComparator().compare(o1.getPriority(), o2.getPriority())); + // verify the priority only because values with same priority may return in different order + Assert.assertEquals( + allServers.stream().map(DruidServerMetadata::getPriority).collect(Collectors.toList()), + serverSelector.getCandidates(-1, CloneQueryMode.EXCLUDECLONES).stream().map(DruidServerMetadata::getPriority).collect(Collectors.toList()) + ); + + // Verify that when getting a limited number of candidates, returns the top N servers with preferred tier first + Assert.assertEquals(expectedCandidates.subList(0, 2), serverSelector.getCandidates(2, CloneQueryMode.EXCLUDECLONES)); + } + + @Test + public void testPreferredTierSelectorStrategyHighestPriority() + { + DirectDruidClient client = EasyMock.createMock(DirectDruidClient.class); + + // Two servers that have same tier and priority + QueryableDruidServer preferredTierLowPriority = new QueryableDruidServer( + new DruidServer("test1", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 0), + client + ); + QueryableDruidServer preferredTierHighPriority = new QueryableDruidServer( + new DruidServer("test2", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 1), + client + ); + + QueryableDruidServer preferredTierHighPriority2 = new QueryableDruidServer( + new DruidServer("test3", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 1), + client + ); + + QueryableDruidServer nonPreferredTierHighestPriority = new QueryableDruidServer( + new DruidServer("test4", "localhost", null, 0, ServerType.HISTORICAL, "non-preferred", 2), + client + ); + + PreferredTierSelectorStrategy tierSelectorStrategy = new PreferredTierSelectorStrategy( + // Use a customized strategy that return the 2nd server + new ServerSelectorStrategy() + { + @Override + public List pick(Set servers, DataSegment segment, int numServersToPick) + { + if (servers.size() <= numServersToPick) { + return ImmutableList.copyOf(servers); + } + List list = new ArrayList<>(servers); + if (numServersToPick == 1) { + // return the server whose name is greater + return list.stream() + .sorted((o1, o2) -> o1.getServer().getName().compareTo(o2.getServer().getName())) + .skip(1) + .limit(1) + .collect(Collectors.toList()); + } else { + return list.stream().limit(numServersToPick).collect(Collectors.toList()); + } + } + }, + new PreferredTierSelectorStrategyConfig("preferred", "highest") + ); + + final ServerSelector serverSelector = new ServerSelector( + new DataSegment( + "test", + Intervals.of("2013-01-01/2013-01-02"), + DateTimes.of("2013-01-01").toString(), + new HashMap<>(), + new ArrayList<>(), + new ArrayList<>(), + NoneShardSpec.instance(), + 0, + 0L + ), + tierSelectorStrategy, + HistoricalFilter.IDENTITY_FILTER + ); + + List servers = new ArrayList<>(Arrays.asList( + preferredTierLowPriority, + preferredTierHighPriority, + preferredTierHighPriority2, + nonPreferredTierHighestPriority + )); + + List expectedCandidates = new ArrayList<>(); + for (QueryableDruidServer server : servers) { + expectedCandidates.add(server.getServer().getMetadata()); + } + for (QueryableDruidServer server : servers) { + serverSelector.addServerAndUpdateSegment(server, serverSelector.getSegment()); + } + + // Verify that the 2nd server is selected + Assert.assertEquals(preferredTierHighPriority2, serverSelector.pick(null, CloneQueryMode.EXCLUDECLONES)); + Assert.assertEquals(preferredTierHighPriority2, serverSelector.pick(EasyMock.createMock(Query.class), CloneQueryMode.EXCLUDECLONES)); + + // Verify that when getting all severs, the preferred tier is ignored, the returned list is sorted by priority + List allServers = new ArrayList<>(expectedCandidates); + allServers.sort((o1, o2) -> tierSelectorStrategy.getComparator().compare(o1.getPriority(), o2.getPriority())); + // verify the priority only because values with same priority may return in different order + Assert.assertEquals( + allServers.stream().map(DruidServerMetadata::getPriority).collect(Collectors.toList()), + serverSelector.getCandidates(-1, CloneQueryMode.EXCLUDECLONES).stream().map(DruidServerMetadata::getPriority).collect(Collectors.toList()) + ); + + // Verify that when getting 2 candidates, returns the top N servers with preferred tier first + Assert.assertEquals( + Arrays.asList( + preferredTierHighPriority.getServer().getMetadata(), + preferredTierHighPriority2.getServer().getMetadata() + ), + + serverSelector.getCandidates(2, CloneQueryMode.EXCLUDECLONES) + .stream() + // sort the name to make sure the test is stable + .sorted((o1, o2) -> o1.getName().compareTo(o2.getName())) + .collect(Collectors.toList()) + ); + } + + @Test + public void testPreferredTierSelectorStrategyLowestPriority() + { + DirectDruidClient client = EasyMock.createMock(DirectDruidClient.class); + QueryableDruidServer preferredTierLowPriority = new QueryableDruidServer( + new DruidServer("test1", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 0), + client + ); + QueryableDruidServer preferredTierHighPriority = new QueryableDruidServer( + new DruidServer("test2", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 1), + client + ); + QueryableDruidServer nonPreferredTierLowestPriority = new QueryableDruidServer( + new DruidServer("test3", "localhost", null, 0, ServerType.HISTORICAL, "non-preferred", -1), + client + ); + + testPreferredTierSelectorStrategy( + new PreferredTierSelectorStrategy( + new ConnectionCountServerSelectorStrategy(), + new PreferredTierSelectorStrategyConfig("preferred", "lowest") + ), + preferredTierLowPriority, preferredTierHighPriority, nonPreferredTierLowestPriority + ); + } + + @Test + public void testPreferredTierSelectorStrategyWithFallback() + { + DirectDruidClient client = EasyMock.createMock(DirectDruidClient.class); + // Create only non-preferred tier servers with different priorities + QueryableDruidServer nonPreferredTierLowPriority = new QueryableDruidServer( + new DruidServer("test1", "localhost", null, 0, ServerType.HISTORICAL, "non-preferred", 0), + client + ); + QueryableDruidServer nonPreferredTierMediumPriority = new QueryableDruidServer( + new DruidServer("test2", "localhost", null, 0, ServerType.HISTORICAL, "non-preferred", 1), + client + ); + QueryableDruidServer nonPreferredTierHighPriority = new QueryableDruidServer( + new DruidServer("test3", "localhost", null, 0, ServerType.HISTORICAL, "non-preferred", 2), + client + ); + + // Since no preferred tier servers are available, it should fall back to other servers + // based on highest priority + testPreferredTierSelectorStrategy( + new PreferredTierSelectorStrategy( + new ConnectionCountServerSelectorStrategy(), + new PreferredTierSelectorStrategyConfig("preferred", "highest") + ), + nonPreferredTierHighPriority, nonPreferredTierMediumPriority, nonPreferredTierLowPriority + ); + } + + @Test + public void testPreferredTierSelectorStrategyMixedServers() + { + DirectDruidClient client = EasyMock.createMock(DirectDruidClient.class); + QueryableDruidServer preferredTierLowPriority = new QueryableDruidServer( + new DruidServer("test1", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 0), + client + ); + QueryableDruidServer preferredTierHighPriority = new QueryableDruidServer( + new DruidServer("test2", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 1), + client + ); + QueryableDruidServer anotherTierHighPriority = new QueryableDruidServer( + new DruidServer("test3", "localhost", null, 0, ServerType.HISTORICAL, "tier1", 3), + client + ); + QueryableDruidServer yetAnotherTierMediumPriority = new QueryableDruidServer( + new DruidServer("test4", "localhost", null, 0, ServerType.HISTORICAL, "tier2", 2), + client + ); + + // Should return preferred tier servers first, sorted by priority + testPreferredTierSelectorStrategy( + new PreferredTierSelectorStrategy( + new ConnectionCountServerSelectorStrategy(), + new PreferredTierSelectorStrategyConfig("preferred", "highest") + ), + preferredTierHighPriority, preferredTierLowPriority, anotherTierHighPriority, yetAnotherTierMediumPriority + ); + } + + @Test + public void testPreferredTierSelectorStrategyDefaultPriority() + { + DirectDruidClient client = EasyMock.createMock(DirectDruidClient.class); + + QueryableDruidServer preferredTierLowPriority = new QueryableDruidServer( + new DruidServer("test1", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 0), + client + ); + QueryableDruidServer preferredTierHighPriority = new QueryableDruidServer( + new DruidServer("test2", "localhost", null, 0, ServerType.HISTORICAL, "preferred", 1), + client + ); + QueryableDruidServer nonPreferredTierHighestPriority = new QueryableDruidServer( + new DruidServer("test3", "localhost", null, 0, ServerType.HISTORICAL, "non-preferred", 2), + client + ); + + testPreferredTierSelectorStrategy( + new PreferredTierSelectorStrategy( + new ConnectionCountServerSelectorStrategy(), + // Using null for priority should default to highest priority + new PreferredTierSelectorStrategyConfig("preferred", null) + ), + preferredTierHighPriority, preferredTierLowPriority, nonPreferredTierHighestPriority + ); + } } diff --git a/services/src/main/java/org/apache/druid/cli/CliBroker.java b/services/src/main/java/org/apache/druid/cli/CliBroker.java index 7af834942bdf..7e3c11a66311 100644 --- a/services/src/main/java/org/apache/druid/cli/CliBroker.java +++ b/services/src/main/java/org/apache/druid/cli/CliBroker.java @@ -37,6 +37,7 @@ import org.apache.druid.client.TimelineServerView; import org.apache.druid.client.cache.CacheConfig; import org.apache.druid.client.selector.CustomTierSelectorStrategyConfig; +import org.apache.druid.client.selector.PreferredTierSelectorStrategyConfig; import org.apache.druid.client.selector.ServerSelectorStrategy; import org.apache.druid.client.selector.TierSelectorStrategy; import org.apache.druid.curator.ZkEnablementConfig; @@ -146,6 +147,7 @@ protected List getModules() JsonConfigProvider.bind(binder, "druid.broker.select", TierSelectorStrategy.class); JsonConfigProvider.bind(binder, "druid.broker.select.tier.custom", CustomTierSelectorStrategyConfig.class); + JsonConfigProvider.bind(binder, "druid.broker.select.tier.preferred", PreferredTierSelectorStrategyConfig.class); JsonConfigProvider.bind(binder, "druid.broker.balancer", ServerSelectorStrategy.class); JsonConfigProvider.bind(binder, "druid.broker.retryPolicy", RetryQueryRunnerConfig.class); JsonConfigProvider.bind(binder, "druid.broker.segment", BrokerSegmentWatcherConfig.class);