You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by el...@apache.org on 2025/10/22 16:45:08 UTC
(superset) 01/01: fix(reports): improve error handling for report schedule execution
This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a commit to branch report-error
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 13794e0fb1dd8f0add31ec3a10b7ad04c745c6db
Author: Elizabeth Thompson <es...@gmail.com>
AuthorDate: Wed Oct 22 09:44:31 2025 -0700
fix(reports): improve error handling for report schedule execution
This commit fixes several issues in report schedule error handling:
1. **Handle StaleDataError gracefully**: Catch and rollback when report
schedules are modified/deleted during execution, providing a clear
error message that doesn't trigger security redaction.
2. **Prevent silent error swallowing**: Add missing `raise` statement
in ReportSuccessState to ensure errors are propagated instead of
being silently ignored.
3. **Prevent recursive logging failures**: Add exception guards around
all update_report_schedule_and_log() calls to prevent infinite loops
when logging itself fails due to database issues.
These changes ensure that report execution errors are properly logged
to both system logs and the report_execution_log table, making debugging
much easier.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <no...@anthropic.com>
---
superset/commands/report/execute.py | 73 +++++++++++++++++++++++++++----------
1 file changed, 53 insertions(+), 20 deletions(-)
diff --git a/superset/commands/report/execute.py b/superset/commands/report/execute.py
index e51b9684dd..19b8e68632 100644
--- a/superset/commands/report/execute.py
+++ b/superset/commands/report/execute.py
@@ -177,19 +177,34 @@ class BaseReportState:
"""
Creates a Report execution log, uses the current computed last_value for Alerts
"""
- log = ReportExecutionLog(
- scheduled_dttm=self._scheduled_dttm,
- start_dttm=self._start_dttm,
- end_dttm=datetime.utcnow(),
- value=self._report_schedule.last_value,
- value_row_json=self._report_schedule.last_value_row_json,
- state=self._report_schedule.last_state,
- error_message=error_message,
- report_schedule=self._report_schedule,
- uuid=self._execution_id,
- )
- db.session.add(log)
- db.session.commit() # pylint: disable=consider-using-transaction
+ from sqlalchemy.orm.exc import StaleDataError
+
+ try:
+ log = ReportExecutionLog(
+ scheduled_dttm=self._scheduled_dttm,
+ start_dttm=self._start_dttm,
+ end_dttm=datetime.utcnow(),
+ value=self._report_schedule.last_value,
+ value_row_json=self._report_schedule.last_value_row_json,
+ state=self._report_schedule.last_state,
+ error_message=error_message,
+ report_schedule=self._report_schedule,
+ uuid=self._execution_id,
+ )
+ db.session.add(log)
+ db.session.commit() # pylint: disable=consider-using-transaction
+ except StaleDataError as ex:
+ # Report schedule was modified or deleted by another process
+ db.session.rollback()
+ logger.warning(
+ "Report schedule %s was modified or deleted during execution. "
+ "This can occur when a report is deleted while running.",
+ self._report_schedule.id,
+ )
+ raise ReportScheduleUnexpectedError(
+ "Report schedule was modified or deleted by another process "
+ "during execution"
+ ) from ex
def _get_url(
self,
@@ -742,7 +757,7 @@ class ReportNotTriggeredErrorState(BaseReportState):
current_states = [ReportState.NOOP, ReportState.ERROR]
initial = True
- def next(self) -> None:
+ def next(self) -> None: # noqa: C901
self.update_report_schedule_and_log(ReportState.WORKING)
try:
# If it's an alert check if the alert is triggered
@@ -752,14 +767,21 @@ class ReportNotTriggeredErrorState(BaseReportState):
return
self.send()
self.update_report_schedule_and_log(ReportState.SUCCESS)
+ except ReportScheduleUnexpectedError:
+ # Don't try to log again if logging itself failed
+ raise
except (SupersetErrorsException, Exception) as first_ex:
error_message = str(first_ex)
if isinstance(first_ex, SupersetErrorsException):
error_message = ";".join([error.message for error in first_ex.errors])
- self.update_report_schedule_and_log(
- ReportState.ERROR, error_message=error_message
- )
+ try:
+ self.update_report_schedule_and_log(
+ ReportState.ERROR, error_message=error_message
+ )
+ except ReportScheduleUnexpectedError:
+ # Logging failed, but we still want to raise the original error
+ raise
# TODO (dpgaspar) convert this logic to a new state eg: ERROR_ON_GRACE
if not self.is_in_error_grace_period():
@@ -775,12 +797,19 @@ class ReportNotTriggeredErrorState(BaseReportState):
second_error_message = ";".join(
[error.message for error in second_ex.errors]
)
+ except ReportScheduleUnexpectedError:
+ # send_error failed due to logging issue
+ raise
except Exception as second_ex: # pylint: disable=broad-except
second_error_message = str(second_ex)
finally:
- self.update_report_schedule_and_log(
- ReportState.ERROR, error_message=second_error_message
- )
+ try:
+ self.update_report_schedule_and_log(
+ ReportState.ERROR, error_message=second_error_message
+ )
+ except ReportScheduleUnexpectedError:
+ # Logging failed again, raise this instead
+ raise
raise
@@ -849,10 +878,14 @@ class ReportSuccessState(BaseReportState):
try:
self.send()
self.update_report_schedule_and_log(ReportState.SUCCESS)
+ except ReportScheduleUnexpectedError:
+ # Don't try to log again if logging itself failed
+ raise
except Exception as ex: # pylint: disable=broad-except
self.update_report_schedule_and_log(
ReportState.ERROR, error_message=str(ex)
)
+ raise
class ReportScheduleStateMachine: # pylint: disable=too-few-public-methods