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

SaltCacheLoader does not create multiple FileClients #53563

Merged
merged 2 commits into from Jun 22, 2019

Conversation

@twangboy
Copy link
Contributor

commented Jun 21, 2019

What does this PR do?

We want to see if this fixes the test suite timeout on Py3 Windows.

This PR changes the way the file_client is instantiated in the Jinja parser. We try to persist the file_client instead of creating a new one every time.

Tests written?

If this works, we'll write some tests...
Yes/No

Commits signed with GPG?

Yes

salt/utils/jinja.py Outdated Show resolved Hide resolved
@twangboy twangboy force-pushed the twangboy:py3_windows_hang branch from 0a6fc92 to f6c592c Jun 21, 2019
@dwoz dwoz changed the title [WIP] Does this fix the test suite hang on Py3 Windows SaltCacheLoader does not create multiple FileClients Jun 22, 2019
@dwoz
dwoz approved these changes Jun 22, 2019
@garethgreenaway garethgreenaway self-requested a review Jun 22, 2019
@garethgreenaway garethgreenaway merged commit 6ed6c31 into saltstack:2019.2.1 Jun 22, 2019
15 of 17 checks passed
15 of 17 checks passed
continuous-integration/jenkins/pr-head This commit cannot be built
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 job has failed
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint test passed
Details
jenkins/pr/py2-centos-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@twangboy twangboy deleted the twangboy:py3_windows_hang branch Jun 24, 2019
twangboy added a commit to twangboy/salt that referenced this pull request Jul 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.