-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Select broker based on query context parameter brokerService
#11495
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.
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
Merged
abhishekagarwal87
merged 7 commits into
apache:master
from
kfaraz:select_broker_by_query_context
Jul 27, 2021
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c0f1f3e
Add QueryContextTieredBrokerSelectorStrategy
kfaraz e785ce4
Add tests for QueryContextTieredBrokerSelectorStrategy
kfaraz 5a40d19
Add test for QueryContexts
kfaraz 91799e5
Rename to ManualTieredBrokerSelectorStrategy
kfaraz 5f2b0ae
Update docs/design/router.md
kfaraz 98a6be0
Fix field names, change log level
kfaraz 9623348
Merge branch 'select_broker_by_query_context' of github.com:kfaraz/dr…
kfaraz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
97 changes: 97 additions & 0 deletions
97
server/src/main/java/org/apache/druid/server/router/ManualTieredBrokerSelectorStrategy.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * 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.server.router; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.base.Optional; | ||
| import org.apache.commons.lang.StringUtils; | ||
| import org.apache.druid.java.util.common.logger.Logger; | ||
| import org.apache.druid.query.Query; | ||
| import org.apache.druid.query.QueryContexts; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| /** | ||
| * Implementation of {@link TieredBrokerSelectorStrategy} which uses the parameter | ||
| * {@link QueryContexts#BROKER_SERVICE_NAME} in the Query context to select the | ||
| * Broker Service. | ||
| * <p> | ||
| * If the {@link #defaultManualBrokerService} is set to a valid Broker Service Name, | ||
| * then all queries that do not specify a valid value for | ||
| * {@link QueryContexts#BROKER_SERVICE_NAME} would be directed to the | ||
| * {@code #defaultManualBrokerService}. Note that the {@code defaultManualBrokerService} | ||
| * can be different from the {@link TieredBrokerConfig#getDefaultBrokerServiceName()}. | ||
| */ | ||
| public class ManualTieredBrokerSelectorStrategy implements TieredBrokerSelectorStrategy | ||
| { | ||
| private static final Logger log = new Logger(ManualTieredBrokerSelectorStrategy.class); | ||
|
|
||
| private final String defaultManualBrokerService; | ||
|
|
||
| @JsonCreator | ||
| public ManualTieredBrokerSelectorStrategy( | ||
| @JsonProperty("defaultManualBrokerService") @Nullable String defaultManualBrokerService | ||
| ) | ||
| { | ||
| this.defaultManualBrokerService = defaultManualBrokerService; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<String> getBrokerServiceName(TieredBrokerConfig tierConfig, Query query) | ||
| { | ||
| try { | ||
| final String contextBrokerService = QueryContexts.getBrokerServiceName(query); | ||
|
|
||
| if (isValidBrokerService(contextBrokerService, tierConfig)) { | ||
| // If the broker service in the query context is valid, use that | ||
| return Optional.of(contextBrokerService); | ||
| } else if (isValidBrokerService(defaultManualBrokerService, tierConfig)) { | ||
| // If the fallbackBrokerService is valid, use that | ||
| return Optional.of(defaultManualBrokerService); | ||
| } else { | ||
| log.warn( | ||
| "Could not find Broker Service [%s] or default [%s] in TieredBrokerConfig", | ||
| contextBrokerService, | ||
| defaultManualBrokerService | ||
| ); | ||
| return Optional.absent(); | ||
| } | ||
| } | ||
| catch (Exception e) { | ||
| log.error(e, "Error getting Broker Service name from Query Context"); | ||
| return isValidBrokerService(defaultManualBrokerService, tierConfig) | ||
| ? Optional.of(defaultManualBrokerService) : Optional.absent(); | ||
| } | ||
| } | ||
|
|
||
| private boolean isValidBrokerService(String brokerServiceName, TieredBrokerConfig tierConfig) | ||
| { | ||
| return !StringUtils.isEmpty(brokerServiceName) | ||
| && tierConfig.getTierToBrokerMap().containsValue(brokerServiceName); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| String getDefaultManualBrokerService() | ||
| { | ||
| return defaultManualBrokerService; | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is defaultManualBrokerService required?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it is an optional field.