You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2021/07/26 12:17:36 UTC
[GitHub] [druid] kfaraz opened a new pull request #11495: Add Query Context flag `brokerServiceName` and corresponding broker selector strategy
kfaraz opened a new pull request #11495:
URL: https://github.com/apache/druid/pull/11495
### Description
This change allows the selection of a specific broker service (or broker tier) by the Router.
The newly added `QueryContextTieredBrokerSelectorStrategy` uses the flag `brokerServiceName`
specified in the Query Context to determine the service name.
### Key changed/added classes in this PR
* `QueryContextTieredBrokerSelectorStrategy`
* `QueryContexts`
<hr>
This PR has:
- [x] been self-reviewed.
- [ ] using the [concurrency checklist](https://github.com/apache/druid/blob/master/dev/code-review/concurrency.md) (Remove this item if the PR doesn't have any relation to concurrency.)
- [x] added documentation for new or modified features or behaviors.
- [x] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
- [ ] added or updated version, license, or notice information in [licenses.yaml](https://github.com/apache/druid/blob/master/dev/license.md)
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
- [x] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
- [ ] added integration tests.
- [ ] been tested in a test Druid cluster.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] kfaraz commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
kfaraz commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677270282
##########
File path: server/src/main/java/org/apache/druid/server/router/ManualTieredBrokerSelectorStrategy.java
##########
@@ -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 #fallbackBrokerService}. Note that the {@code fallbackBrokerService}
Review comment:
Yes, it is the same. I have fixed the name.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] kfaraz commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
kfaraz commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677152826
##########
File path: server/src/main/java/org/apache/druid/server/router/QueryContextTieredBrokerSelectorStrategy.java
##########
@@ -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 #fallbackBrokerService} 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 #fallbackBrokerService}. Note that the {@code fallbackBrokerService}
+ * can be different from the {@link TieredBrokerConfig#getDefaultBrokerServiceName()}.
+ */
+public class QueryContextTieredBrokerSelectorStrategy implements TieredBrokerSelectorStrategy
+{
+ private static final Logger log = new Logger(QueryContextTieredBrokerSelectorStrategy.class);
+
+ private final String fallbackBrokerService;
+
+ @JsonCreator
+ public QueryContextTieredBrokerSelectorStrategy(
+ @JsonProperty("fallbackBrokerService") @Nullable String fallbackBrokerService
+ )
+ {
+ this.fallbackBrokerService = fallbackBrokerService;
+ }
+
+ @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(fallbackBrokerService, tierConfig)) {
Review comment:
We don't have the `TieredBrokerConfig` in the constructor, because the object is being constructed from deserialization of config and not by Guice.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] kfaraz commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
kfaraz commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677177708
##########
File path: docs/design/router.md
##########
@@ -109,6 +109,19 @@ Including this strategy means all timeBoundary queries are always routed to the
Queries with a priority set to less than minPriority are routed to the lowest priority Broker. Queries with priority set to greater than maxPriority are routed to the highest priority Broker. By default, minPriority is 0 and maxPriority is 1. Using these default values, if a query with priority 0 (the default query priority is 0) is sent, the query skips the priority selection logic.
+#### queryContext
+
+This strategy reads the parameter `brokerService` from the query context and routes the query accordingly. If no valid `brokerService` is specified in the query context, the field `fallbackBrokerService` is used if set to a valid non-null value.
Review comment:
Renamed to `defaultManualBrokerService`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] abhishekagarwal87 commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
abhishekagarwal87 commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677140980
##########
File path: server/src/main/java/org/apache/druid/server/router/QueryContextTieredBrokerSelectorStrategy.java
##########
@@ -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 #fallbackBrokerService} 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 #fallbackBrokerService}. Note that the {@code fallbackBrokerService}
+ * can be different from the {@link TieredBrokerConfig#getDefaultBrokerServiceName()}.
+ */
+public class QueryContextTieredBrokerSelectorStrategy implements TieredBrokerSelectorStrategy
+{
+ private static final Logger log = new Logger(QueryContextTieredBrokerSelectorStrategy.class);
+
+ private final String fallbackBrokerService;
+
+ @JsonCreator
+ public QueryContextTieredBrokerSelectorStrategy(
+ @JsonProperty("fallbackBrokerService") @Nullable String fallbackBrokerService
+ )
+ {
+ this.fallbackBrokerService = fallbackBrokerService;
+ }
+
+ @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(fallbackBrokerService, tierConfig)) {
Review comment:
could we perform this check in the constructor itself? your class would have Optional<String> broker that would either be Optional.absent() or Optional.of(fallbackBrokerService). you can return the field as it is.
##########
File path: docs/design/router.md
##########
@@ -109,6 +109,19 @@ Including this strategy means all timeBoundary queries are always routed to the
Queries with a priority set to less than minPriority are routed to the lowest priority Broker. Queries with priority set to greater than maxPriority are routed to the highest priority Broker. By default, minPriority is 0 and maxPriority is 1. Using these default values, if a query with priority 0 (the default query priority is 0) is sent, the query skips the priority selection logic.
+#### queryContext
+
+This strategy reads the parameter `brokerService` from the query context and routes the query accordingly. If no valid `brokerService` is specified in the query context, the field `fallbackBrokerService` is used if set to a valid non-null value.
Review comment:
can we call `fallbackBrokerService` `defaultBrokerService` instead? Latter looks more common in druid codebase.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] maytasm commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
maytasm commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677213922
##########
File path: server/src/main/java/org/apache/druid/server/router/ManualTieredBrokerSelectorStrategy.java
##########
@@ -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 #fallbackBrokerService}. Note that the {@code fallbackBrokerService}
Review comment:
What is `fallbackBrokerService`? Is it the same as `defaultManualBrokerService`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] maytasm commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
maytasm commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677216917
##########
File path: docs/design/router.md
##########
@@ -109,6 +109,19 @@ Including this strategy means all timeBoundary queries are always routed to the
Queries with a priority set to less than minPriority are routed to the lowest priority Broker. Queries with priority set to greater than maxPriority are routed to the highest priority Broker. By default, minPriority is 0 and maxPriority is 1. Using these default values, if a query with priority 0 (the default query priority is 0) is sent, the query skips the priority selection logic.
+#### manual
+
+This strategy reads the parameter `brokerService` from the query context and routes the query to that broker service. If no valid `brokerService` is specified in the query context, the field `defaultManualBrokerService` is used to determine target broker service given the value is valid and non-null. A value is considered valid if it is present in `druid.router.tierToBrokerMap`
+
+*Example*: A strategy that routes queries to the Broker "druid:broker-hot" if no valid `brokerService` is found in the query context.
+
+```json
+{
+ "type": "manual",
+ "defaultManualBrokerService": "druid:broker-hot"
Review comment:
is defaultManualBrokerService required?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] abhishekagarwal87 commented on pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
abhishekagarwal87 commented on pull request #11495:
URL: https://github.com/apache/druid/pull/11495#issuecomment-887608487
Merging since CI failure (kafka integration test) is unrelated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] abhishekagarwal87 merged pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
abhishekagarwal87 merged pull request #11495:
URL: https://github.com/apache/druid/pull/11495
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] abhishekagarwal87 commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
abhishekagarwal87 commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677183695
##########
File path: docs/design/router.md
##########
@@ -109,6 +109,19 @@ Including this strategy means all timeBoundary queries are always routed to the
Queries with a priority set to less than minPriority are routed to the lowest priority Broker. Queries with priority set to greater than maxPriority are routed to the highest priority Broker. By default, minPriority is 0 and maxPriority is 1. Using these default values, if a query with priority 0 (the default query priority is 0) is sent, the query skips the priority selection logic.
+#### manual
+
+This strategy reads the parameter `brokerService` from the query context and routes the query accordingly. If no valid `brokerService` is specified in the query context, the field `defaultManualBrokerService` is used if set to a valid non-null value.
Review comment:
```suggestion
This strategy reads the parameter `brokerService` from the query context and routes the query to that broker service. If no valid `brokerService` is specified in the query context, the field `defaultManualBrokerService` is used to determine target broker service given the value is valid and non-null. A value is considered valid if it is present in `druid.router.tierToBrokerMap`
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] kfaraz commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
kfaraz commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677270640
##########
File path: docs/design/router.md
##########
@@ -109,6 +109,19 @@ Including this strategy means all timeBoundary queries are always routed to the
Queries with a priority set to less than minPriority are routed to the lowest priority Broker. Queries with priority set to greater than maxPriority are routed to the highest priority Broker. By default, minPriority is 0 and maxPriority is 1. Using these default values, if a query with priority 0 (the default query priority is 0) is sent, the query skips the priority selection logic.
+#### manual
+
+This strategy reads the parameter `brokerService` from the query context and routes the query to that broker service. If no valid `brokerService` is specified in the query context, the field `defaultManualBrokerService` is used to determine target broker service given the value is valid and non-null. A value is considered valid if it is present in `druid.router.tierToBrokerMap`
+
+*Example*: A strategy that routes queries to the Broker "druid:broker-hot" if no valid `brokerService` is found in the query context.
+
+```json
+{
+ "type": "manual",
+ "defaultManualBrokerService": "druid:broker-hot"
Review comment:
No, it is an optional field.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] kfaraz commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
kfaraz commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677152826
##########
File path: server/src/main/java/org/apache/druid/server/router/QueryContextTieredBrokerSelectorStrategy.java
##########
@@ -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 #fallbackBrokerService} 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 #fallbackBrokerService}. Note that the {@code fallbackBrokerService}
+ * can be different from the {@link TieredBrokerConfig#getDefaultBrokerServiceName()}.
+ */
+public class QueryContextTieredBrokerSelectorStrategy implements TieredBrokerSelectorStrategy
+{
+ private static final Logger log = new Logger(QueryContextTieredBrokerSelectorStrategy.class);
+
+ private final String fallbackBrokerService;
+
+ @JsonCreator
+ public QueryContextTieredBrokerSelectorStrategy(
+ @JsonProperty("fallbackBrokerService") @Nullable String fallbackBrokerService
+ )
+ {
+ this.fallbackBrokerService = fallbackBrokerService;
+ }
+
+ @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(fallbackBrokerService, tierConfig)) {
Review comment:
I don't have the `TieredBrokerConfig` in the constructor, because the object is being constructed from deserialization of config and not by Guice.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] kfaraz commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
kfaraz commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677269973
##########
File path: server/src/main/java/org/apache/druid/server/router/ManualTieredBrokerSelectorStrategy.java
##########
@@ -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 #fallbackBrokerService}. Note that the {@code fallbackBrokerService}
+ * 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.debug(
Review comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] maytasm commented on a change in pull request #11495: Select broker based on query context parameter `brokerService`
Posted by GitBox <gi...@apache.org>.
maytasm commented on a change in pull request #11495:
URL: https://github.com/apache/druid/pull/11495#discussion_r677215426
##########
File path: server/src/main/java/org/apache/druid/server/router/ManualTieredBrokerSelectorStrategy.java
##########
@@ -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 #fallbackBrokerService}. Note that the {@code fallbackBrokerService}
+ * 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.debug(
Review comment:
Should this be error level or at least warning to indicate that some config (either queryContext and/or defaultManualBrokerService) are set incorrect?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org