feat: Implement Celery SoftTimeLimit handling #13740
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #13740 +/- ##
==========================================
+ Coverage 79.40% 79.43% +0.03%
==========================================
Files 938 938
Lines 47541 47553 +12
Branches 5940 5940
==========================================
+ Hits 37749 37774 +25
+ Misses 9666 9653 -13
Partials 126 126
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
lilykuang
force-pushed
the
lily/soft-time-limit
branch
4 times, most recently
from
1b6ec9b
to
27d98f5
Compare
|
@dpgaspar would you mind taking a look at this? |
willbarrett
reviewed
Mar 29, 2021
superset/reports/commands/alert.py
Outdated
| @@ -146,7 +146,8 @@ def _execute_query(self) -> pd.DataFrame: | |||
| rendered_sql, ALERT_SQL_LIMIT | |||
| ) | |||
| return self._report_schedule.database.get_df(limited_rendered_sql) | |||
| except SoftTimeLimitExceeded: | |||
| except SoftTimeLimitExceeded as ex: | |||
| logger.error("A timeout occurred while executing the alert query: %s", ex) | |||
There was a problem hiding this comment.
I don't think we need to log the errors - this is somewhat expected behavior.
dpgaspar
reviewed
Mar 30, 2021
superset/tasks/scheduler.py
Outdated
| @@ -67,6 +68,8 @@ def execute(report_schedule_id: int, scheduled_dttm: str) -> None: | |||
| AsyncExecuteReportScheduleCommand(report_schedule_id, scheduled_dttm_).run() | |||
| except ReportScheduleUnexpectedError as ex: | |||
| logger.error("An unexpected occurred while executing the report: %s", ex) | |||
| except SoftTimeLimitExceeded as ex: | |||
There was a problem hiding this comment.
nit: this is probably unnecessary because we already catch and reraise it here: https://github.com/apache/superset/blob/master/superset/reports/commands/execute.py#L183
superset/sql_lab.py
Outdated
| logger.error("Query %d: Time limit exceeded", query_id) | ||
| logger.debug("Query %d: %s", query_id, ex) | ||
| raise SqlLabTimeoutException( | ||
| "SQL Lab timeout. This environment's policy is to kill queries " |
There was a problem hiding this comment.
If this error goes to the user we should translate it using flask babel
lilykuang
force-pushed
the
lily/soft-time-limit
branch
5 times, most recently
from
6a7b823
to
d291ec3
Compare
added 3 commits
April 8, 2021 14:17
lilykuang
force-pushed
the
lily/soft-time-limit
branch
from
d291ec3
to
009c43a
Compare
willbarrett
approved these changes
Apr 12, 2021
dpgaspar
approved these changes
Apr 12, 2021
amitmiran137
pushed a commit
that referenced
this pull request
Apr 13, 2021
* master: fix: unable to apply logging format (#14074) refactor: Bootstrap to AntD - Slider (#13989) chore(spa refactor): refactoring dashboard to use api's instead of bootstrapdata (#13306) fix(listview): update listview feature flag (#13906) Add docs for configuring Docker Compose setup (#13961) feat: invalid password error message (Postgres) (#14038) fix: flacky test in test_update_dataset_item_w_override_columns (#14082) feat: Implement Celery SoftTimeLimit handling (#13740) feat: only send alert error emails to owners of the alert (#13862) feat: add descriptions to report emails (#13827) Make chart exclude itself from cross filtering (#14046) fix: fix bug when remove chart not removing it's related cross filter data (#14081) feat(native-filters): Add default first value to select filter (#13726) feat: Make async query JWT cookie domain configurable (#14007) fix: add exception to catch session not having JWT (#14036) # Conflicts: # superset-frontend/src/dashboard/actions/hydrate.js # superset/views/core.py
amitmiran137
pushed a commit
that referenced
this pull request
Apr 13, 2021
* master: (53 commits) test: Adds tests to the UndoRedoKeyListeners component (#13919) chore: Adds dataMask reducer to reducerIndex (#13951) test: Tests audit for the Dashboard FilterBar (#13916) fix: unable to apply logging format (#14074) refactor: Bootstrap to AntD - Slider (#13989) chore(spa refactor): refactoring dashboard to use api's instead of bootstrapdata (#13306) fix(listview): update listview feature flag (#13906) Add docs for configuring Docker Compose setup (#13961) feat: invalid password error message (Postgres) (#14038) fix: flacky test in test_update_dataset_item_w_override_columns (#14082) feat: Implement Celery SoftTimeLimit handling (#13740) feat: only send alert error emails to owners of the alert (#13862) feat: add descriptions to report emails (#13827) Make chart exclude itself from cross filtering (#14046) fix: fix bug when remove chart not removing it's related cross filter data (#14081) feat(native-filters): Add default first value to select filter (#13726) feat: Make async query JWT cookie domain configurable (#14007) fix: add exception to catch session not having JWT (#14036) Use consistent chart value (#14031) fix: Use superset generic db to catch external_metadata queries (#13974) ...
allanco91
pushed a commit
to allanco91/superset
that referenced
this pull request
May 21, 2021
* log soft time limit error * lint * update test
QAlexBall
pushed a commit
to QAlexBall/superset
that referenced
this pull request
Dec 29, 2021
* log soft time limit error * lint * update test
mistercrunch
added
🏷️ bot
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SUMMARY
BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
TEST PLAN
ADDITIONAL INFORMATION