mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-03-19 07:11:13 +00:00
sourceppa: Retry on timeouts
We're still seeing britney runs failing due to this exception. The timeout has already been raised to 30 seconds - maybe retrying the requests a few times will work better.
This commit is contained in:
parent
5c74268d75
commit
81d522ff29
@ -1,5 +1,6 @@
|
||||
import os
|
||||
import json
|
||||
import socket
|
||||
import urllib.request
|
||||
import urllib.parse
|
||||
|
||||
@ -19,23 +20,6 @@ IGNORE = [
|
||||
]
|
||||
|
||||
|
||||
def query_lp_rest_api(obj, query):
|
||||
"""Do a Launchpad REST request
|
||||
|
||||
Request <LAUNCHPAD_URL><obj>?<query>.
|
||||
|
||||
Returns dict of parsed json result from launchpad.
|
||||
Raises HTTPError, ValueError, or ConnectionError based on different
|
||||
transient failures connecting to launchpad.
|
||||
"""
|
||||
url = '%s%s?%s' % (LAUNCHPAD_URL, obj, urllib.parse.urlencode(query))
|
||||
with urllib.request.urlopen(url, timeout=30) as req:
|
||||
code = req.getcode()
|
||||
if 200 <= code < 300:
|
||||
return json.loads(req.read().decode('UTF-8'))
|
||||
raise ConnectionError('Failed to reach launchpad, HTTP %s' % code)
|
||||
|
||||
|
||||
class SourcePPAPolicy(BasePolicy):
|
||||
"""Migrate packages copied from same source PPA together
|
||||
|
||||
@ -55,13 +39,40 @@ class SourcePPAPolicy(BasePolicy):
|
||||
# self.cache contains self.source_ppas_by_pkg from previous run
|
||||
self.cache = {}
|
||||
|
||||
def query_lp_rest_api(self, obj, query, retries=5):
|
||||
"""Do a Launchpad REST request
|
||||
|
||||
Request <LAUNCHPAD_URL><obj>?<query>.
|
||||
|
||||
Returns dict of parsed json result from launchpad.
|
||||
Raises HTTPError, ValueError, or ConnectionError based on different
|
||||
transient failures connecting to launchpad.
|
||||
"""
|
||||
assert retries > 0
|
||||
|
||||
url = '%s%s?%s' % (LAUNCHPAD_URL, obj, urllib.parse.urlencode(query))
|
||||
try:
|
||||
with urllib.request.urlopen(url, timeout=30) as req:
|
||||
code = req.getcode()
|
||||
if 200 <= code < 300:
|
||||
return json.loads(req.read().decode('UTF-8'))
|
||||
raise ConnectionError('Failed to reach launchpad, HTTP %s'
|
||||
% code)
|
||||
except socket.timeout:
|
||||
if retries > 1:
|
||||
self.log("Timeout downloading '%s', will retry %d more times."
|
||||
% (url, retries))
|
||||
self.query_lp_rest_api(obj, query, retries - 1)
|
||||
else:
|
||||
raise
|
||||
|
||||
def lp_get_source_ppa(self, pkg, version):
|
||||
"""Ask LP what source PPA pkg was copied from"""
|
||||
cached = self.cache.get(pkg, {}).get(version)
|
||||
if cached is not None:
|
||||
return cached
|
||||
|
||||
data = query_lp_rest_api('%s/%s' % (self.options.distribution, self.options.series), {
|
||||
data = self.query_lp_rest_api('%s/%s' % (self.options.distribution, self.options.series), {
|
||||
'ws.op': 'getPackageUploads',
|
||||
'archive': PRIMARY,
|
||||
'pocket': 'Proposed',
|
||||
|
@ -98,6 +98,17 @@ class T(unittest.TestCase):
|
||||
with self.assertRaisesRegex(ValueError, 'Expecting value'):
|
||||
pol.lp_get_source_ppa('hello', '1.0')
|
||||
|
||||
@patch('policies.sourceppa.urllib.request.urlopen')
|
||||
def test_lp_rest_api_timeout(self, urlopen):
|
||||
"""If we get a timeout connecting to LP, we try 5 times"""
|
||||
import socket
|
||||
# test that we're retried 5 times on timeout
|
||||
urlopen.side_effect = socket.timeout
|
||||
pol = SourcePPAPolicy(FakeOptions)
|
||||
with self.assertRaises(socket.timeout):
|
||||
pol.lp_get_source_ppa('hello', '1.0')
|
||||
self.assertEqual(urlopen.call_count, 5)
|
||||
|
||||
def test_approve_ppa(self):
|
||||
"""Approve packages by their PPA."""
|
||||
shortppa = 'team/ubuntu/ppa'
|
||||
|
Loading…
x
Reference in New Issue
Block a user