Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this? (check all applicable)
Description
After moving query executions to RQ, job timeouts resulted in
JobTimeoutException
being raised. Since some query runners perform cleanup when executions are being cancelled by users, the same cleanup should be performed when jobs time out. (i.e. cancel the database query).While going through the different query runners, I've noticed that query cancellation code is very repetitive, and sometimes just unnecessary and only returns a "Query cancelled by user." error message. I've modified these to raise the exception and have the serializer handle that automatically.
One caveat is that previously, when cancelling a query, the user would see "Query cancelled by user", and now it will also include an "Error running query" prefix.
This is due to me reusing the error status code for the serialized job, we could easily work around this by introducing a "cancelled" status call ("failed" doesn't feel right).
Related Tickets & Documents
#4307 #4629
Mobile & Desktop Screenshots/Recordings (if there are UI changes)