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 multiple mashes racing for the comps directory #1885

Merged
merged 4 commits into from Oct 11, 2017

Conversation

Projects
None yet
2 participants
@puiterwijk
Member

puiterwijk commented Oct 10, 2017

Without this, multiple running mashes might get in each others way with the comps
repository.
If one mash is just performing the "make", and another starts with the "git pull"
phase, the "make" might hit on filees that the "git pull" is still writing out,
leading to incorrect XML files being parsed, and masher erroring out.

This patch makes the comps repos be cloned into a directory per mash.

Signed-off-by: Patrick Uiterwijk patrick@puiterwijk.org

Fix multiple mashes racing for the comps directory
Without this, multiple running mashes might get in each others way with the comps
repository.
If one mash is just performing the "make", and another starts with the "git pull"
phase, the "make" might hit on filees that the "git pull" is still writing out,
leading to incorrect XML files being parsed, and masher erroring out.

This patch makes the comps repos be cloned into a directory per mash.

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

@puiterwijk puiterwijk requested a review from bowlofeggs Oct 10, 2017

@fedora-infra fedora-infra deleted a comment from centos-ci Oct 10, 2017

@bowlofeggs bowlofeggs self-assigned this Oct 10, 2017

@bowlofeggs

This comment has been minimized.

Show comment
Hide comment
@bowlofeggs

bowlofeggs Oct 11, 2017

Member

I approve @puiterwijk's commit, but have added three of my own on top that I need review on from somebody. This will become a 2.12.1 release.

Member

bowlofeggs commented Oct 11, 2017

I approve @puiterwijk's commit, but have added three of my own on top that I need review on from somebody. This will become a 2.12.1 release.

bowlofeggs added some commits Oct 11, 2017

PEP-{8,257} some comps code in bodhi.server.consumers.masher.
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
Add tests for MasherThread.my_comps_dir.
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
Write release notes for 2.12.1.
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

@fedora-infra fedora-infra deleted a comment from centos-ci Oct 11, 2017

@puiterwijk

This comment has been minimized.

Show comment
Hide comment
@puiterwijk

puiterwijk Oct 11, 2017

Member

@bowlofeggs The extra commits look good to me. (I can't GH-approve the PR).

Member

puiterwijk commented Oct 11, 2017

@bowlofeggs The extra commits look good to me. (I can't GH-approve the PR).

@bowlofeggs bowlofeggs merged commit a95bba4 into develop Oct 11, 2017

2 checks passed

DCO All commits have a DCO sign-off from the author
default Build finished.
Details

@bowlofeggs bowlofeggs deleted the fixcomps branch Oct 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment