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.

Sign up for GitHub

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

Jump to bottom

Avoid second grains load on windows multiprocessing #33076

Merged
merged 2 commits into from
May 25, 2016
Merged

Avoid second grains load on windows multiprocessing #33076

merged 2 commits into from
May 25, 2016

Conversation

cachedout
Copy link
Contributor

This drops the load time of any Windows call by about 1.5s

@cachedout cachedout mentioned this pull request May 5, 2016
Closed
@rallytime
Copy link
Contributor

Go Go Jenkins!

@rallytime
Copy link
Contributor

@cachedout hrm...was this possibly branched off of a stale branch or something like that? The test vms aren't building and there are many pylint errors on files that you didn't touch.

@rallytime rallytime mentioned this pull request May 11, 2016
Closed
@rallytime
Copy link
Contributor

@cachedout I rebased this on a newer version of 2016.3 in #33174, and the test results were the same. I am not sure what is going on here, but I'll close my PR and let you clean this one up instead.

@rallytime rallytime added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label May 11, 2016
@cachedout cachedout mentioned this pull request May 16, 2016
Closed
@cachedout
Copy link
Contributor Author

Go Go Jenkins!

Avoid second grains load on windows multiprocessing
b14e2cc 
This drops the load time of any Windows call by about 1.5s
@cachedout
Copy link
Contributor Author

Go Go Jenkins!

@cachedout cachedout merged commit 4cf40da into saltstack:2016.3 May 25, 2016
cachedout pushed a commit to cachedout/salt that referenced this pull request May 31, 2016
Fix indentation error in minion.py
8259d40 
Refs saltstack#33076
@cachedout cachedout mentioned this pull request May 31, 2016
Merged
@cachedout
Copy link
Contributor Author

@twangboy Oops. See #33656. Apologies.

@twangboy
Copy link
Contributor

@cachedout Thanks!

@rallytime
Copy link
Contributor

@cachedout This change, for some reason, is causing problems in the test suite upon a merge-forward. The tests that are failing in #33711 all fail because the sub-minion that is spun up by the test suite is no longer reachable/available/found. It seems that this change is conflicting with something that is currently already present in the develop branch, though the code change itself didn't cause a merge conflict.

@rallytime rallytime mentioned this pull request Jun 8, 2016
Merged
@cachedout cachedout mentioned this pull request Jun 9, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cachedout @rallytime @twangboy