summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSloane Hertel <shertel@redhat.com>2018-02-21 13:49:28 -0500
committerRyan Brown <sb@ryansb.com>2018-02-21 13:49:28 -0500
commit32515884efce06e9141d0e317ed960b2027d4da9 (patch)
treee6560a6e37c4ec38980793a031cc95698309ade1
parent77af8f36cb93a7e38beb0de84a8f34db50ee8c7d (diff)
downloadansible-32515884efce06e9141d0e317ed960b2027d4da9.tar.gz
[cloud] Change to longer interval jittered backoffs for AWS facts (#36266) (#36464)
* Change to longer interval jittered backoffs for security group fact gathering * Add the ECS throttling error code to the list of things to retry on
-rw-r--r--lib/ansible/modules/cloud/amazon/efs_facts.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/modules/cloud/amazon/efs_facts.py b/lib/ansible/modules/cloud/amazon/efs_facts.py
index 7dd4fe5713..49c595d775 100644
--- a/lib/ansible/modules/cloud/amazon/efs_facts.py
+++ b/lib/ansible/modules/cloud/amazon/efs_facts.py
@@ -186,7 +186,7 @@ class EFSConnection(object):
self.region = region
- @AWSRetry.exponential_backoff()
+ @AWSRetry.exponential_backoff(catch_extra_error_codes=['ThrottlingException'])
def list_file_systems(self, **kwargs):
"""
Returns generator of file systems including all attributes of FS
@@ -194,7 +194,7 @@ class EFSConnection(object):
paginator = self.connection.get_paginator('describe_file_systems')
return paginator.paginate(**kwargs).build_full_result()['FileSystems']
- @AWSRetry.exponential_backoff()
+ @AWSRetry.exponential_backoff(catch_extra_error_codes=['ThrottlingException'])
def get_tags(self, file_system_id):
"""
Returns tag list for selected instance of EFS
@@ -202,7 +202,7 @@ class EFSConnection(object):
paginator = self.connection.get_paginator('describe_tags')
return boto3_tag_list_to_ansible_dict(paginator.paginate(FileSystemId=file_system_id).build_full_result()['Tags'])
- @AWSRetry.exponential_backoff()
+ @AWSRetry.exponential_backoff(catch_extra_error_codes=['ThrottlingException'])
def get_mount_targets(self, file_system_id):
"""
Returns mount targets for selected instance of EFS
@@ -210,7 +210,7 @@ class EFSConnection(object):
paginator = self.connection.get_paginator('describe_mount_targets')
return paginator.paginate(FileSystemId=file_system_id).build_full_result()['MountTargets']
- @AWSRetry.exponential_backoff()
+ @AWSRetry.jittered_backoff(catch_extra_error_codes=['ThrottlingException'])
def get_security_groups(self, mount_target_id):
"""
Returns security groups for selected instance of EFS