localhost background/at jobs: record host name #2849
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@oliver-sanders @kinow please review or reassign to someone near you. |
+1 |
|
#2809 will require an associated change to work with this PR, I'm guessing the following would do the job: if (
- itask.task_host == 'localhost' and
+ itask.task_host == get_host() and
- itask.summary['batch_sys_name'] in ['background', 'at'] and
itask.state.status in TASK_STATUSES_ACTIVE
):@matthewrmshin any thoughts? |
oliver-sanders
approved these changes
Nov 8, 2018
kinow
approved these changes
Nov 9, 2018
There was a problem hiding this comment.
Code looks good, comments ditto. Travis-CI happy 🎉
Tested using master first, and got
kinow@kinow-VirtualBox:~/cylc-run/five/log/suite$ cat log.20181109T004933Z
2018-11-09T00:49:33Z INFO - Suite server: url=https://kinow-VirtualBox:43092/ pid=3126
2018-11-09T00:49:33Z INFO - Run: (re)start=0 log=1
2018-11-09T00:49:33Z INFO - Cylc version: 7.7.1-352-g395e2
2018-11-09T00:49:33Z INFO - Run mode: live
2018-11-09T00:49:33Z INFO - Initial point: 20130808T0000Z
2018-11-09T00:49:33Z INFO - Final point: 20130812T0000Z
2018-11-09T00:49:33Z INFO - Cold Start 20130808T0000Z
2018-11-09T00:49:33Z INFO - [prep.20130808T0000Z] -submit-num=1, owner@host=localhost
Then switched to this pull request's branch, and confirmed that the host had changed.
2018-11-09T00:55:14Z INFO - Suite starting: server=kinow-VirtualBox:43006 pid=5271
2018-11-09T00:55:14Z INFO - Cylc version: 7.7.1-332-g19ad1
2018-11-09T00:55:14Z INFO - Run mode: live
2018-11-09T00:55:14Z INFO - Initial point: 20130808T0000Z
2018-11-09T00:55:14Z INFO - Final point: 20130812T0000Z
2018-11-09T00:55:14Z INFO - Cold Start 20130808T0000Z
2018-11-09T00:55:14Z INFO - [prep.20130808T0000Z] -submit-num=1, owner@host=kinow-VirtualBox
And just to make sure, had a look inside the sqlite database, and confirmed at least the task_jobs table had the new value too, instead of localhost.
...
sqlite> select * from task_jobs;
20130808T0000Z|prep|1|0|1|2018-11-09T00:55:14Z|2018-11-09T00:55:15Z|0|2018-11-09T00:55:15Z|2018-11-09T00:55:15Z||0|kinow-VirtualBox|background|5328
20130808T0000Z|foo|1|0|1|2018-11-09T00:55:17Z|2018-11-09T00:55:18Z|0|2018-11-09T00:55:18Z|2018-11-09T00:55:18Z||0|kinow-VirtualBox|background|5421
...
|
Happy to merge, but it got conflicted 😢 |
Ensure that localhost background/at jobs are recorded as running on the host name of the current suite host, rather than just `localhost`. On suite restart on a different suite host, this allows the restart logic to correctly poll the status of the background/at jobs that may still be running on the previous suite host.
matthewrmshin
force-pushed
the
persist-localhost-bg-at-host-as-suite-hostname
branch
from
19ad1dd
to
4006ff8
Compare
|
Branch rebased to resolve conflicts. |
|
Just waiting for Travis-CI to hit the merge button 🎉 |
matthewrmshin
deleted the
persist-localhost-bg-at-host-as-suite-hostname
branch
oliver-sanders
added a commit
to oliver-sanders/cylc-flow
that referenced
this pull request
Nov 9, 2018
oliver-sanders
added a commit
to oliver-sanders/cylc-flow
that referenced
this pull request
Nov 9, 2018
oliver-sanders
added a commit
to oliver-sanders/cylc-flow
that referenced
this pull request
Nov 14, 2018
oliver-sanders
added a commit
to metomi/rose
that referenced
this pull request
Nov 16, 2018
…cylc-2781 Fix tests broken by cylc/cylc-flow#2781 and cylc/cylc-flow#2849
oliver-sanders
added a commit
to oliver-sanders/cylc-flow
that referenced
this pull request
Nov 21, 2018
oliver-sanders
added a commit
to oliver-sanders/cylc-flow
that referenced
this pull request
Nov 21, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ensure that
localhostbackground/at jobs are recorded as running on the host name of the current suite host, rather than justlocalhost. On suite restart on a different suite host, this allows the restart logic to correctly poll the status of the background/at jobs that may still be running on the previous suite host.Perfect companion of #2809.