saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Faster timeout (3s vs 2min) for instance metadata lookups. #13850.

Browse source
This commit is contained in:
Peter Tripp 2015-10-05 12:17:59 -07:00
parent 4d7be3f972
commit 3d9483b4e2
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/utils/aws.py
View file

@ -45,6 +45,7 @@ AWS_RETRY_CODES = [
'InsufficientAddressCapacity',
'InsufficientReservedInstanceCapacity',
]
AWS_METADATA_TIMEOUT = 3.05
IROLE_CODE = 'use-instance-role-credentials'
__AccessKeyId__ = ''
@ -77,17 +78,17 @@ def creds(provider):
# We don't have any cached credentials, or they are expired, get them
# TODO: Wrap this with a try and handle exceptions gracefully
# Connections to instance meta-data must never be proxied
# Connections to instance meta-data must fail fast and never be proxied
result = requests.get(
"http://169.254.169.254/latest/meta-data/iam/security-credentials/",
proxies={'http': ''},
proxies={'http': ''}, timeout=AWS_METADATA_TIMEOUT,
)
result.raise_for_status()
role = result.text
# TODO: Wrap this with a try and handle exceptions gracefully
result = requests.get(
"http://169.254.169.254/latest/meta-data/iam/security-credentials/{0}".format(role),
proxies={'http': ''},
proxies={'http': ''}, timeout=AWS_METADATA_TIMEOUT,
)
result.raise_for_status()
data = result.json()
@ -465,10 +466,10 @@ def get_region_from_metadata():
return __Location__
try:
# Connections to instance meta-data must never be proxied
# Connections to instance meta-data must fail fast and never be proxied
result = requests.get(
"http://169.254.169.254/latest/dynamic/instance-identity/document",
proxies={'http': ''},
proxies={'http': ''}, timeout=AWS_METADATA_TIMEOUT,
)
except requests.exceptions.RequestException:
LOG.warning('Failed to get AWS region from instance metadata.', exc_info=True)