Skip to content

Spend less time waiting for LocalTaskJob's subprocss process to finish #11373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashb merged 2 commits into from
Oct 13, 2020
Merged

Spend less time waiting for LocalTaskJob's subprocss process to finish #11373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0ea217
Spend less time waiting for LocalTaskJob's subprocss process to finish
ashb May 28, 2020
0161bc0
fixup! Spend less time waiting for LocalTaskJob's subprocss process t…
ashb Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions airflow/executors/dask_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def _process_future(self, future: Future) -> None:
self.futures.pop(future)

def sync(self) -> None:
if not self.futures:
if self.futures is None:
raise AirflowException(NOT_STARTED_MESSAGE)
# make a copy so futures can be popped during iteration
for future in self.futures.copy():
Expand All @@ -109,14 +109,14 @@ def sync(self) -> None:
def end(self) -> None:
if not self.client:
raise AirflowException(NOT_STARTED_MESSAGE)
if not self.futures:
if self.futures is None:
raise AirflowException(NOT_STARTED_MESSAGE)
self.client.cancel(list(self.futures.keys()))
for future in as_completed(self.futures.copy()):
self._process_future(future)

def terminate(self):
if not self.futures:
if self.futures is None:
raise AirflowException(NOT_STARTED_MESSAGE)
self.client.cancel(self.futures.keys())
self.end()
19 changes: 15 additions & 4 deletions airflow/jobs/local_task_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,22 @@ def signal_handler(signum, frame):
try:
self.task_runner.start()

heartbeat_time_limit = conf.getint('scheduler',
'scheduler_zombie_task_threshold')
heartbeat_time_limit = conf.getint('scheduler', 'scheduler_zombie_task_threshold')

while True:
# Monitor the task to see if it's done
return_code = self.task_runner.return_code()
# Monitor the task to see if it's done. Wait in a syscall
# (`os.wait`) for as long as possible so we notice the
# subprocess finishing as quick as we can
max_wait_time = max(
0, # Make sure this value is never negative,
min(
(heartbeat_time_limit -
(timezone.utcnow() - self.latest_heartbeat).total_seconds() * 0.75),
self.heartrate,
)
)

return_code = self.task_runner.return_code(timeout=max_wait_time)
if return_code is not None:
self.log.info("Task exited with return code %s", return_code)
return
Expand Down
5 changes: 4 additions & 1 deletion airflow/task/task_runner/standard_task_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@ def terminate(self):
if self.process is None:
return

if self.process.is_running():
# Reap the child process - it may already be finished
_ = self.return_code(timeout=0)

if self.process and self.process.is_running():
rcs = reap_process_group(self.process.pid, self.log)
self._rc = rcs.get(self.process.pid)

Expand Down
2 changes: 1 addition & 1 deletion tests/dags/test_heartbeat_failed_fast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
dag = DAG(dag_id='test_heartbeat_failed_fast', default_args=args)
task = BashOperator(
task_id='test_heartbeat_failed_fast_op',
bash_command='sleep 5',
bash_command='sleep 7',
dag=dag)
4 changes: 1 addition & 3 deletions tests/jobs/test_local_task_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,10 @@ def test_localtaskjob_heartbeat(self, mock_pid):
mock_pid.return_value = 2
self.assertRaises(AirflowException, job1.heartbeat_callback)

@patch('os.getpid')
def test_heartbeat_failed_fast(self, mock_getpid):
def test_heartbeat_failed_fast(self):
"""
Test that task heartbeat will sleep when it fails fast
"""
mock_getpid.return_value = 1
self.mock_base_job_sleep.side_effect = time.sleep

with create_session() as session:
Expand Down