Skip to content

Commit

Permalink
auto-restart: only wait for local jobs running on localhost
Browse files Browse the repository at this point in the history
  • Loading branch information
oliver-sanders committed Sep 14, 2020
1 parent eab1b1c commit 8a32905
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ templates in [runtime][X][environment].

### Fixes

[#3815](https://github.com/cylc/cylc-flow/pull/3815) - Fixes a minor bug in the
auto-restart functionality which caused suites to wait for local jobs running
on *any* host to complete before restarting.

[#3732](https://github.com/cylc/cylc-flow/pull/3732) - XTrigger labels
are now validated to ensure that runtime errors can not occur when
exporting environment variables.
Expand Down
7 changes: 6 additions & 1 deletion cylc/flow/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@
)
import cylc.flow.flags
from cylc.flow.host_select import select_suite_host
from cylc.flow.hostuserutil import get_host, get_user
from cylc.flow.hostuserutil import (
get_host,
get_user,
is_remote_platform
)
from cylc.flow.job_pool import JobPool
from cylc.flow.loggingutil import (
TimestampRotatingFileHandler,
Expand Down Expand Up @@ -1528,6 +1532,7 @@ async def suite_shutdown(self):
if (
itask.state(*TASK_STATUSES_ACTIVE)
and itask.summary['batch_sys_name']
and not is_remote_platform(itask.platform)
and self.task_job_mgr.batch_sys_mgr
.is_job_local_to_host(
itask.summary['batch_sys_name'])
Expand Down

0 comments on commit 8a32905

Please sign in to comment.