This is an automated email from the ASF dual-hosted git repository.
jlli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 0ccc6471e0 Exclude secondary workload queries from some critical
metrics (#14553)
0ccc6471e0 is described below
commit 0ccc6471e0834c1b55bdd6aa2336be1f61230cb5
Author: Vivek Iyer Vaidyanathan <vviveki...@gmail.com>
AuthorDate: Tue Dec 3 02:12:31 2024 +0530
Exclude secondary workload queries from some critical metrics (#14553)
---
.../requesthandler/BaseSingleStageBrokerRequestHandler.java | 12 ++++++++++--
.../requesthandler/SingleConnectionBrokerRequestHandler.java | 11 +++++++++--
.../java/org/apache/pinot/common/metrics/BrokerMeter.java | 4 ++++
.../java/org/apache/pinot/common/metrics/BrokerTimer.java | 4 +++-
4 files changed, 26 insertions(+), 5 deletions(-)
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java
index 89868cf6fa..ed6c58ad0f 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java
@@ -842,8 +842,16 @@ public abstract class BaseSingleStageBrokerRequestHandler
extends BaseBrokerRequ
if (QueryOptionsUtils.shouldDropResults(pinotQuery.getQueryOptions())) {
brokerResponse.setResultTable(null);
}
- _brokerMetrics.addTimedTableValue(rawTableName,
BrokerTimer.QUERY_TOTAL_TIME_MS, totalTimeMs,
- TimeUnit.MILLISECONDS);
+ if (QueryOptionsUtils.isSecondaryWorkload(pinotQuery.getQueryOptions()))
{
+ _brokerMetrics.addTimedTableValue(rawTableName,
BrokerTimer.SECONDARY_WORKLOAD_QUERY_TOTAL_TIME_MS, totalTimeMs,
+ TimeUnit.MILLISECONDS);
+
_brokerMetrics.addTimedValue(BrokerTimer.SECONDARY_WORKLOAD_QUERY_TOTAL_TIME_MS,
totalTimeMs,
+ TimeUnit.MILLISECONDS);
+ } else {
+ _brokerMetrics.addTimedTableValue(rawTableName,
BrokerTimer.QUERY_TOTAL_TIME_MS, totalTimeMs,
+ TimeUnit.MILLISECONDS);
+ _brokerMetrics.addTimedValue(BrokerTimer.QUERY_TOTAL_TIME_MS,
totalTimeMs, TimeUnit.MILLISECONDS);
+ }
// Log query and stats
_queryLogger.log(
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java
index 349affe6c8..7ad9268b0d 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/SingleConnectionBrokerRequestHandler.java
@@ -41,6 +41,7 @@ import org.apache.pinot.common.metrics.BrokerQueryPhase;
import org.apache.pinot.common.request.BrokerRequest;
import org.apache.pinot.common.response.broker.BrokerResponseNative;
import org.apache.pinot.common.response.broker.QueryProcessingException;
+import org.apache.pinot.common.utils.config.QueryOptionsUtils;
import org.apache.pinot.core.query.reduce.BrokerReduceService;
import org.apache.pinot.core.transport.AsyncQueryResponse;
import org.apache.pinot.core.transport.QueryResponse;
@@ -116,7 +117,9 @@ public class SingleConnectionBrokerRequestHandler extends
BaseSingleStageBrokerR
_failureDetector.notifyQuerySubmitted(asyncQueryResponse);
Map<ServerRoutingInstance, ServerResponse> finalResponses =
asyncQueryResponse.getFinalResponses();
if (asyncQueryResponse.getStatus() == QueryResponse.Status.TIMED_OUT) {
- _brokerMetrics.addMeteredTableValue(rawTableName,
BrokerMeter.BROKER_RESPONSES_WITH_TIMEOUTS, 1);
+ BrokerMeter meter =
QueryOptionsUtils.isSecondaryWorkload(serverBrokerRequest.getPinotQuery().getQueryOptions())
+ ? BrokerMeter.SECONDARY_WORKLOAD_BROKER_RESPONSES_WITH_TIMEOUTS :
BrokerMeter.BROKER_RESPONSES_WITH_TIMEOUTS;
+ _brokerMetrics.addMeteredTableValue(rawTableName, meter, 1);
}
_failureDetector.notifyQueryFinished(asyncQueryResponse);
_brokerMetrics.addPhaseTiming(rawTableName,
BrokerQueryPhase.SCATTER_GATHER,
@@ -162,7 +165,11 @@ public class SingleConnectionBrokerRequestHandler extends
BaseSingleStageBrokerR
if (numServersNotResponded != 0) {
brokerResponse.addException(new
QueryProcessingException(QueryException.SERVER_NOT_RESPONDING_ERROR_CODE,
String.format("%d servers %s not responded", numServersNotResponded,
serversNotResponded)));
- _brokerMetrics.addMeteredTableValue(rawTableName,
BrokerMeter.BROKER_RESPONSES_WITH_PARTIAL_SERVERS_RESPONDED, 1);
+
+ BrokerMeter meter =
QueryOptionsUtils.isSecondaryWorkload(serverBrokerRequest.getPinotQuery().getQueryOptions())
+ ?
BrokerMeter.SECONDARY_WORKLOAD_BROKER_RESPONSES_WITH_PARTIAL_SERVERS_RESPONDED
+ : BrokerMeter.BROKER_RESPONSES_WITH_PARTIAL_SERVERS_RESPONDED;
+ _brokerMetrics.addMeteredTableValue(rawTableName, meter, 1);
}
if (brokerResponse.getExceptionsSize() > 0) {
_brokerMetrics.addMeteredTableValue(rawTableName,
BrokerMeter.BROKER_RESPONSES_WITH_PROCESSING_EXCEPTIONS, 1);
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
index c36b4ab504..ea6a66251c 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java
@@ -105,8 +105,12 @@ public enum BrokerMeter implements AbstractMetrics.Meter {
// (numServersQueried > numServersResponded)
BROKER_RESPONSES_WITH_PARTIAL_SERVERS_RESPONDED("badResponses", false),
+
SECONDARY_WORKLOAD_BROKER_RESPONSES_WITH_PARTIAL_SERVERS_RESPONDED("badResponses",
false),
+
BROKER_RESPONSES_WITH_TIMEOUTS("badResponses", false),
+ SECONDARY_WORKLOAD_BROKER_RESPONSES_WITH_TIMEOUTS("badResponses", false),
+
// This metric track the number of broker responses with number of groups
limit reached (potential bad responses).
BROKER_RESPONSES_WITH_NUM_GROUPS_LIMIT_REACHED("badResponses", false),
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java
b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java
index 38c132eb4e..2e70cf69bb 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerTimer.java
@@ -29,7 +29,9 @@ public enum BrokerTimer implements AbstractMetrics.Timer {
ROUTING_TABLE_UPDATE_TIME(true),
CLUSTER_CHANGE_QUEUE_TIME(true), // metric tracking the freshness lag for
consuming segments
FRESHNESS_LAG_MS(false),
- QUERY_TOTAL_TIME_MS(false),
+ QUERY_TOTAL_TIME_MS(true),
+
+ SECONDARY_WORKLOAD_QUERY_TOTAL_TIME_MS(true),
// The latency of sending the request from broker to server
NETTY_CONNECTION_SEND_REQUEST_LATENCY(false),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
