Skip to content
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.

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

1905: Don't ignore dependencies in tasks inserted before start pt. #1921

Merged
merged 3 commits into from
Jul 6, 2016

Conversation

arjclark
Copy link
Contributor

Closes #1905

This change means that any task inserted prior to the start point will maintain its prerequisites rather than having them wiped out. Existing behaviour maintained (no changes needed to existing tests) and new test added for this desired behaviour.

@hjoliver - please review 1
@benfitzpatrick - please review 2

@arjclark arjclark added this to the next release milestone Jun 30, 2016
@arjclark arjclark changed the title 1905: Don't ignore dependencies in tasks inserted before warm-start pt. 1905: Don't ignore dependencies in tasks inserted before start pt. Jun 30, 2016
@matthewrmshin matthewrmshin added the bug Something is wrong :( label Jul 1, 2016
@@ -109,7 +110,8 @@ def set_condition(self, expr):
try:
foo = m.group().split(".")[1].rstrip()
if get_point(foo) < self.start_point:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can combine the ifs?

@benfitzpatrick
Copy link
Contributor

In your example suite, if I insert the family at T06 in held state, then insert it again at T12, I guess we don't get bar[-PT6H] => foo?

@arjclark
Copy link
Contributor Author

arjclark commented Jul 4, 2016

In your example suite, if I insert the family at T06 in held state, then insert it again at T12, I guess we don't get bar[-PT6H] => foo?

Not sure I understand your question - if the cycle at which a task is inserted is prior to the start cycle (start point/whatever) then its prerequisites are not filtered. You see this in the example suite as the task (foo) is set to ready in order for it to be able to run.

@arjclark
Copy link
Contributor Author

arjclark commented Jul 4, 2016

@benfitzpatrick - if statement tweaked.

@arjclark
Copy link
Contributor Author

arjclark commented Jul 5, 2016

@benfitzpatrick - I've added the extra test to ensure future continuation of functionality as we discussed yesterday.

@benfitzpatrick
Copy link
Contributor

Ok, looks good to me

@benfitzpatrick benfitzpatrick merged commit 29de185 into cylc:master Jul 6, 2016
@benfitzpatrick
Copy link
Contributor

Oops - merged without @hjoliver.

@benfitzpatrick
Copy link
Contributor

Any retrospective approval?

@hjoliver
Copy link
Member

hjoliver commented Jul 6, 2016

Retrospectively tested and approved. (However, an email coming on a related issue...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :(
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants