Jackie-Jiang commented on code in PR #15992:
URL: https://github.com/apache/pinot/pull/15992#discussion_r2146217796
##########
pinot-query-runtime/src/main/java/org/apache/pinot/query/service/dispatch/QueryDispatcher.java:
##########
@@ -164,18 +164,23 @@ public QueryResult submitAndReduce(RequestContext
context, DispatchableSubPlan d
throws Exception {
long requestId = context.getRequestId();
Set<QueryServerInstance> servers = new HashSet<>();
+ boolean cancelled = false;
try {
submit(requestId, dispatchableSubPlan, timeoutMs, servers, queryOptions);
- return runReducer(requestId, dispatchableSubPlan, timeoutMs,
queryOptions, _mailboxService);
+ QueryResult result = runReducer(requestId, dispatchableSubPlan,
timeoutMs, queryOptions, _mailboxService);
+ if (result.getProcessingException() != null) {
+ MultiStageQueryStats statsFromCancel = cancelWithStats(requestId,
servers);
+ cancelled = true;
+ return result.withStats(statsFromCancel);
+ }
+ return result;
} catch (Exception ex) {
- return tryRecover(context.getRequestId(), servers, ex);
- } catch (Throwable e) {
- // TODO: Consider always cancel when it returns (early terminate)
- cancel(requestId);
- throw e;
+ QueryResult queryResult = tryRecover(context.getRequestId(), servers,
ex);
+ cancelled = true;
+ return queryResult;
} finally {
- if (isQueryCancellationEnabled()) {
- _serversByQuery.remove(requestId);
+ if (!cancelled) {
+ cancel(requestId, servers);
Review Comment:
Sending one more request to each server on happy path does add overhead.
Ideally we want to avoid this overhead. This is not a blocker, but we should
try to figure out a way to minimize the overhead for happy path
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
