kaxil closed pull request #4108: [AIRFLOW-3263] Ignore exception when 'run'
tries to kill already killed job
URL: https://github.com/apache/incubator-airflow/pull/4108
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/airflow/utils/helpers.py b/airflow/utils/helpers.py
index 3ebd5f75c6..328147c1cf 100644
--- a/airflow/utils/helpers.py
+++ b/airflow/utils/helpers.py
@@ -22,6 +22,8 @@
from __future__ import print_function
from __future__ import unicode_literals
+import errno
+
import psutil
from builtins import input
@@ -234,7 +236,15 @@ def on_terminate(p):
children = parent.children(recursive=True)
children.append(parent)
- log.info("Sending %s to GPID %s", sig, os.getpgid(pid))
+ try:
+ pg = os.getpgid(pid)
+ except OSError as err:
+ # Skip if not such process - we experience a race and it just
terminated
+ if err.errno == errno.ESRCH:
+ return
+ raise
+
+ log.info("Sending %s to GPID %s", sig, pg)
os.killpg(os.getpgid(pid), sig)
gone, alive = psutil.wait_procs(children, timeout=timeout,
callback=on_terminate)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
