Support a timeout for running queries in the query manager #6081
Conversation
jsternberg
force-pushed
the
js-6075-query-time-limit
branch
2 times, most recently
from
7680d76 to
0765537
Compare
| @@ -19,6 +19,9 @@ const ( | |||
| // DefaultMaxRemoteWriteConnections is the maximum number of open connections | |||
| // that will be available for remote writes to another host. | |||
| DefaultMaxRemoteWriteConnections = 3 | |||
|
|
|||
| // DefaultQueryTimeout is the default timeout for executing a query. | |||
| DefaultQueryTimeout = 5 * time.Minute | |||
There was a problem hiding this comment.
I think this should default to no timeout unless it's configured to be set.
There was a problem hiding this comment.
I changed the timeout to 0 seconds which should result in no timeout.
jsternberg
force-pushed
the
js-6075-query-time-limit
branch
2 times, most recently
from
43f972c to
63fd3aa
Compare
Include an interrupt iterator at the top level to interrupt the fill iterator if it is producing too many points. Fixes #6075.
jsternberg
force-pushed
the
js-6075-query-time-limit
branch
from
63fd3aa to
79fe449
Compare
| @@ -8,6 +8,7 @@ | |||
| - [#5939](https://github.com/influxdata/influxdb/issues/5939): Support viewing and killing running queries. | |||
| - [#6073](https://github.com/influxdata/influxdb/pulls/6073): Iterator stats | |||
| - [#6079](https://github.com/influxdata/influxdb/issues/6079): Limit the maximum number of concurrent queries. | |||
| - [#6075](https://github.com/influxdata/influxdb/issues/6075): Limit the maximum running time of a query. | |||
There was a problem hiding this comment.
Shouldn't this be [#6081](https://github.com/influxdata/influxdb/pull/6081) ? Looks like some previous ones in that list aren't quite right either.
There was a problem hiding this comment.
I'm a bit confused with how we do this and we should probably standardize it. I've been using the issue that the PR fixes while some include the PR. If there is no issue for the PR, then I include the PR link.
There was a problem hiding this comment.
@jsternberg That's correct. Use the issue fixed. If there is no issue, use the PR.
|
LGTM 👍 |
Include an interrupt iterator at the top level to interrupt the fill
iterator if it is producing too many points.
Fixes #6075.