Flush pending Sentry exceptions before exiting (#7232)

Fixes AIRFLOW-6569 by explicitly flushing pending exceptions prior to calling `os._exit` within the forked task runner.
apache · U-Ozdemir · Apr 30, 2020 · Apr 30, 2020 · Apr 30, 2020 · May 1, 2020
commit db70da2ab1f79e6041d95f57663df55a5ee1d145
diff --git a/airflow/sentry.py b/airflow/sentry.py
@@ -51,6  51,11 @@ def enrich_errors(cls, run):
         """
         return run
 
     def flush(self):
         """
         Blank function for flushing errors.
         """
 
 
 class ConfiguredSentry(DummySentry):
     """
@@ -146,6  151,10 @@ def wrapper(task_instance, *args, session=None, **kwargs):
 
         return wrapper
 
     def flush(self):
         import sentry_sdk
         sentry_sdk.flush()
 
 
 Sentry = DummySentry()  # type: DummySentry
 

diff --git a/airflow/task/task_runner/standard_task_runner.py b/airflow/task/task_runner/standard_task_runner.py
@@ -54,6  54,7 @@ def _start_by_fork(self):  # pylint: disable=inconsistent-return-statements
             return psutil.Process(pid)
         else:
             from airflow.cli.cli_parser import get_parser
             from airflow.sentry import Sentry
             import signal
             import airflow.settings as settings
 
@@ -79,9  80,13 @@ def _start_by_fork(self):  # pylint: disable=inconsistent-return-statements
 
             try:
                 args.func(args, dag=self.dag)
-                os._exit(0)  # pylint: disable=protected-access
                 return_code = 0
             except Exception:  # pylint: disable=broad-except
-                os._exit(1)  # pylint: disable=protected-access
                 return_code = 1
             finally:
                 # Explicitly flush any pending exception to Sentry if enabled
                 Sentry.flush()
                 os._exit(return_code)  # pylint: disable=protected-access
 
     def return_code(self, timeout=0):
         # We call this multiple times, but we can only wait on the process once