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

Add timeouts to all s3 queries #48562

Merged
merged 1 commit into from Jul 13, 2018

Conversation

Projects
None yet
3 participants
@basepi
Member

basepi commented Jul 12, 2018

What does this PR do?

Add timeouts to all s3 queries

What issues does this PR fix or reference?

n/a

Previous Behavior

According to http://docs.python-requests.org/en/master/user/advanced/#timeouts:

By default, requests do not time out unless a timeout value is set explicitly.

This is undesirable behavior.

New Behavior

Will timeout after 5 minutes. This would be pretty trivial to make into a config option, but for now I figured an insanely long timeout is better than none.

Tests written?

No

Commits signed with GPG?

Yes

@rallytime rallytime merged commit fab5d96 into saltstack:develop Jul 13, 2018

10 of 17 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11394 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6424 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24352 — FAILURE
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
WIP ready for review
Details
codeclimate All good!
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26639 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18669 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23305 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20477 — SUCCESS
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
@basepi

This comment has been minimized.

Member

basepi commented Jul 16, 2018

@rallytime I recommend that this be backported to all versions. Forgot to mention that in the original PR.

@rallytime

This comment has been minimized.

Contributor

rallytime commented Jul 16, 2018

Sure thing @basepi

rallytime added a commit that referenced this pull request Jul 17, 2018

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