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

Fix cycle detection for single node workflows. #3374

Merged
merged 1 commit into from Mar 8, 2017

Conversation

Projects
None yet
3 participants
@jmchilton
Copy link
Member

commented Dec 27, 2016

Fixes #3236.

@jmchilton jmchilton added this to the 17.01 milestone Dec 27, 2016

input_index = steps_to_index[conn.input_step]
# self connection - a cycle not detectable by topsort function.
if output_index == input_index:
raise CycleError([], 0, 0)

This comment has been minimized.

Copy link
@guerler

guerler Jan 8, 2017

Contributor

Should we just raise the CycleError without keywords here? Overall it is a good fix. Thanks.

This comment has been minimized.

Copy link
@jmchilton

jmchilton Jan 8, 2017

Author Member

They don't look optional to me I guess.

class CycleError(Exception):
    def __init__(self, sofar, numpreds, succs):
        Exception.__init__(self, "cycle in constraints",
                           sofar, numpreds, succs)
        self.preds = None

This comment has been minimized.

Copy link
@guerler

guerler Jan 9, 2017

Contributor

I wonder why its raised without keywords in the other two cases within this module.

@bgruening

This comment has been minimized.

Copy link
Member

commented Jan 8, 2017

@galaxybot test this

@bgruening

This comment has been minimized.

Copy link
Member

commented Jan 8, 2017

@guerler up to you to merge this PR :)

@jmchilton jmchilton modified the milestones: 17.05, 17.01 Jan 12, 2017

@jmchilton

This comment has been minimized.

Copy link
Member Author

commented Jan 12, 2017

Re-targeting for 17.05 - not an important fix. I'll research the error handling a bit more to answer the above question.

@guerler

This comment has been minimized.

Copy link
Contributor

commented Feb 9, 2017

Yeah that would be good to know. It's not a big deal tho. Thanks for the fix.

@guerler

This comment has been minimized.

Copy link
Contributor

commented Mar 7, 2017

Is this WIP?

@jmchilton

This comment has been minimized.

Copy link
Member Author

commented Mar 7, 2017

Very slow progress - I haven't touched this since opening it. Feel free to just close it or look into changing the error handling yourself if you are eager.

@guerler

This comment has been minimized.

Copy link
Contributor

commented Mar 7, 2017

It looks good to me and I think you are raising the error in the correct way. I will merge it when the WIP flag is taken off.

@jmchilton jmchilton removed the status/WIP label Mar 8, 2017

@jmchilton

This comment has been minimized.

Copy link
Member Author

commented Mar 8, 2017

@guerler Okay - I removed the WIP label.

@guerler guerler merged commit b9c1abd into galaxyproject:dev Mar 8, 2017

5 checks passed

api test Build finished. 244 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 133 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 24 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details
@guerler

This comment has been minimized.

Copy link
Contributor

commented Mar 8, 2017

Thanks for the fix @jmchilton

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.