Merge ~tribaal/cloud-init:fix/exoscale-datasource-wait-timeout into cloud-init:master

Proposed by Chris Glass
Status: Merged
Approved by: Scott Moser
Approved revision: 46310972f0ce5513b93d1c3c813cf6ef0b62f2f4
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~tribaal/cloud-init:fix/exoscale-datasource-wait-timeout
Merge into: cloud-init:master
Diff against target: 13 lines (+2/-0)
1 file modified
cloudinit/sources/DataSourceExoscale.py (+2/-0)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Watkins Approve
Review via email: mp+374643@code.launchpad.net

Description of the change

exoscale: Increase url_max_wait to 120s.

The exoscale datasource defines a shorter timeout than the default (10)
but did not override url_max_wait, resulting in a single attempt being
made to wait for the metadata service.

In some rare cases, a race condition means the route to the metadata
service is not set within 10 seconds, and more attempts should be made.

This sets the url_max_wait for the datasource to 120.

To post a comment you must log in.
Revision history for this message
Chris Glass (tribaal) wrote :

Note: retrying 12 times on average might be overkill here - but we rather be pessimistic and add a lot of buffer.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:46310972f0ce5513b93d1c3c813cf6ef0b62f2f4
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1229/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1229//rebuild

review: Approve (continuous-integration)
Revision history for this message
Dan Watkins (oddbloke) wrote :

LGTM, thanks!

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

Commit message lints:
- Line #0 has 55 too many characters. Line starts with: "This change sets the"...- Line #2 has 156 too many characters. Line starts with: "In some rare cases the"...

review: Needs Fixing
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

Autolanding: FAILED
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/cloud-init-autoland-test/376/
Executed test runs:
    FAILED: Checkout

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/DataSourceExoscale.py b/cloudinit/sources/DataSourceExoscale.py
2index fdfb4ed..4616daa 100644
3--- a/cloudinit/sources/DataSourceExoscale.py
4+++ b/cloudinit/sources/DataSourceExoscale.py
5@@ -26,6 +26,8 @@ class DataSourceExoscale(sources.DataSource):
6
7 dsname = 'Exoscale'
8
9+ url_max_wait = 120
10+
11 def __init__(self, sys_cfg, distro, paths):
12 super(DataSourceExoscale, self).__init__(sys_cfg, distro, paths)
13 LOG.debug("Initializing the Exoscale datasource")

Subscribers

People subscribed via source and target branches