diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-05-24 19:27:08 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-05-24 19:27:08 -0400 |
| commit | 2ec72c91b7ba60b260ba0a50097df16f82960dd8 (patch) | |
| tree | a740659e805b0f4ccc9229d88e91e099f2d668a8 /cloudinit/ec2_utils.py | |
| parent | fdede2004249a8c0ac302531a5b3bc048458be3d (diff) | |
| download | vyos-cloud-init-2ec72c91b7ba60b260ba0a50097df16f82960dd8.tar.gz vyos-cloud-init-2ec72c91b7ba60b260ba0a50097df16f82960dd8.zip | |
fix logic error in ec2 get_instance_userdata and slow tests
The change to get_instance_userdata is to fix an issue that
was causing retry in the test when it was not desired.
if user_data returned 404 it means "there was no user-data", so
dont bother retrying. However, _skip_retry_on_codes was returning
False indicating that readurl should retry.
test_merging was creating 2500 random tests, shrink that down to 100.
test_seed_runs is still on my system the slowest test, but
taking < .5 seconds where it was taking > 3.
Diffstat (limited to 'cloudinit/ec2_utils.py')
| -rw-r--r-- | cloudinit/ec2_utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py index 37b92a83..90b34eff 100644 --- a/cloudinit/ec2_utils.py +++ b/cloudinit/ec2_utils.py @@ -144,9 +144,10 @@ def _skip_retry_on_codes(status_codes, _request_args, cause): """Returns if a request should retry based on a given set of codes that case retrying to be stopped/skipped. """ - if cause.code in status_codes: - return False - return True + print("status_codes=%s" % status_codes) + print("_request_args=%s" % _request_args) + print("cause=%s" % cause) + return cause.code in status_codes def get_instance_userdata(api_version='latest', |