mirror of https://github.com/apache/druid.git
Cancel the group by processing tasks if the merging runner gets scheduled post the query timeout (#17037)
If the GroupByMergingQueryRunner gets scheduled after the query timeout, it fails to clean up the processing tasks that have been scheduled. This can lead to unnecessary processing being done for the tasks whos results won't get consumed.
This commit is contained in:
parent
a95397e712
commit
d3392a23ce
|
@ -375,7 +375,7 @@ public class GroupByMergingQueryRunner implements QueryRunner<ResultRow>
|
|||
GuavaUtils.cancelAll(true, future, futures);
|
||||
throw new QueryInterruptedException(e);
|
||||
}
|
||||
catch (TimeoutException e) {
|
||||
catch (QueryTimeoutException | TimeoutException e) {
|
||||
log.info("Query timeout, cancelling pending results for query id [%s]", query.getId());
|
||||
GuavaUtils.cancelAll(true, future, futures);
|
||||
throw new QueryTimeoutException();
|
||||
|
|
Loading…
Reference in New Issue