airship
/
shipyard
Code Issues Proposed changes

Add retries to node lookup logic 

In the case of a temporary failure to lookup nodes, this introduces a
nominal number of retries to possibly bridge the failure. By default 2
reties, spaced 30 seconds apart will be attempted. Some exceptions may
not benefit from retries; this change doesn't account for the myriad
situations thay may benefit from short circuiting.

Change-Id: Icbedf5c1d8ca485c36ef6ba31e8c0201f0f28b6d
This commit is contained in:
Bryan Strassner 2018-08-27 10:55:42 -05:00 committed by Ahmad Mahmoudi
parent 0b6f702014
commit 5adad71bb3
2 changed files with 101 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/bin/shipyard_airflow/shipyard_airflow/common/deployment_group/node_lookup.py
View File

@ -16,11 +16,13 @@
to retrieve nodes based on a list of GroupNodeSelector objects
"""
import logging
import time
from .deployment_group import GroupNodeSelector
from .errors import (
InvalidDeploymentGroupNodeLookupError
)
from drydock_provisioner import error as errors
LOG = logging.getLogger(__name__)
@ -30,8 +32,13 @@ class NodeLookup:
:param drydock_client: a Drydock Client (Api Client from Drydock)
:param design_ref: the design ref that will be used to perform a lookup
:param retries: the number of times to retry a lookup if an exception
is raised. Defaults to 2 retries.
:param retry_delay: seconds to wait between retries. Defaults to 30s.
Note that after the specified number of retries, any exceptions will be
bubbled out to the client of this node lookup
"""
def __init__(self, drydock_client, design_ref):
def __init__(self, drydock_client, design_ref, retries=2, retry_delay=30):
# Empty dictionary or none for design ref will not work.
if not design_ref:
raise InvalidDeploymentGroupNodeLookupError(
@ -42,6 +49,8 @@ class NodeLookup:
raise TypeError('Drydock client is required.')
self.design_ref = design_ref
self.drydock_client = drydock_client
self.retries = retries
self.retry_delay = retry_delay
def lookup(self, selectors):
"""Lookup method
@ -51,9 +60,32 @@ class NodeLookup:
"""
sel_list = _validate_selectors(selectors)
node_filter = _generate_node_filter(sel_list)
return _get_nodes_for_filter(self.drydock_client,
self.design_ref,
node_filter)
retries_remaining = self.retries or 0
while retries_remaining >= 0:
try:
return _get_nodes_for_filter(self.drydock_client,
self.design_ref,
node_filter)
except (errors.ClientUnauthorizedError,
errors.ClientForbiddenError) as er:
# do not retry the client related (4xx) errors
msg = "Status Code: {:d}, Status message: {}".format(
er.status_code, er.message)
LOG.exception("Lookup of nodes encountered a client error."
"{}. Will not retry this error.".format(msg))
raise
except (errors.ClientError, Exception) as ex:
# This only includes the 5xx and drydock uncautht errors.
if retries_remaining > 0:
LOG.exception("Lookup of nodes encountered a problem, "
"but will be retried. Retries "
"remaining: %d", retries_remaining)
retries_remaining -= 1
time.sleep(self.retry_delay)
else:
LOG.exception("Lookup of nodes failed. No retries "
"available")
raise
def _validate_selectors(selectors):

65
src/bin/shipyard_airflow/tests/unit/common/deployment_group/test_node_lookup.py
View File

@ -27,6 +27,7 @@ from shipyard_airflow.common.deployment_group.errors import (
from shipyard_airflow.common.deployment_group.node_lookup import (
NodeLookup, _generate_node_filter, _validate_selectors
)
from drydock_provisioner import error as errors
class TestNodeLookup:
@ -144,6 +145,70 @@ class TestNodeLookup:
resp = nl.lookup([sel])
assert resp == ['node1', 'node2']
@mock.patch('shipyard_airflow.common.deployment_group.node_lookup'
'._get_nodes_for_filter',
side_effect=errors.ClientError("nope"))
def test_NodeLookup_lookup_retry(self, get_nodes):
"""Test the functionality of the setup and lookup functions"""
nl = NodeLookup(mock.MagicMock(), {"design": "ref"}, retry_delay=0.1)
sel = GroupNodeSelector({
'node_names': [],
'node_labels': [],
'node_tags': [],
'rack_names': [],
})
with pytest.raises(errors.ClientError) as ex:
resp = nl.lookup([sel])
assert get_nodes.call_count == 3
@mock.patch('shipyard_airflow.common.deployment_group.node_lookup'
'._get_nodes_for_filter',
side_effect=Exception("nope"))
def test_NodeLookup_lookup_retry_exception(self, get_nodes):
"""Test the functionality of the setup and lookup functions"""
nl = NodeLookup(mock.MagicMock(), {"design": "ref"}, retry_delay=0.1)
sel = GroupNodeSelector({
'node_names': [],
'node_labels': [],
'node_tags': [],
'rack_names': [],
})
with pytest.raises(Exception) as ex:
resp = nl.lookup([sel])
assert get_nodes.call_count == 3
@mock.patch('shipyard_airflow.common.deployment_group.node_lookup'
'._get_nodes_for_filter',
side_effect=errors.ClientUnauthorizedError("nope"))
def test_NodeLookup_lookup_client_unauthorized(self, get_nodes):
"""Test the functionality of the setup and lookup functions"""
nl = NodeLookup(mock.MagicMock(), {"design": "ref"}, retry_delay=0.1)
sel = GroupNodeSelector({
'node_names': [],
'node_labels': [],
'node_tags': [],
'rack_names': [],
})
with pytest.raises(errors.ClientUnauthorizedError) as ex:
resp = nl.lookup([sel])
assert get_nodes.call_count == 1
@mock.patch('shipyard_airflow.common.deployment_group.node_lookup'
'._get_nodes_for_filter',
side_effect=errors.ClientForbiddenError("nope"))
def test_NodeLookup_lookup_client_forbidden(self, get_nodes):
"""Test the functionality of the setup and lookup functions"""
nl = NodeLookup(mock.MagicMock(), {"design": "ref"}, retry_delay=0.1)
sel = GroupNodeSelector({
'node_names': [],
'node_labels': [],
'node_tags': [],
'rack_names': [],
})
with pytest.raises(errors.ClientForbiddenError) as ex:
resp = nl.lookup([sel])
assert get_nodes.call_count == 1
def test_NodeLookup_lookup_missing_design_ref(self):
"""Test the functionality of the setup and lookup functions"""
with pytest.raises(InvalidDeploymentGroupNodeLookupError) as idgnle: