diff --git a/nova/conf/neutron.py b/nova/conf/neutron.py index 33fca355dd2b..bc0ae6c7468e 100644 --- a/nova/conf/neutron.py +++ b/nova/conf/neutron.py @@ -112,6 +112,20 @@ Related options: all tunneled networks * ``[neutron_physnet_$PHYSNET] numa_nodes`` must be configured for each value of ``$PHYSNET`` specified by this option +"""), + cfg.IntOpt('http_retries', + default=3, + min=0, + help=""" +Number of times neutronclient should retry on any failed http call. + +0 means connection is attempted only once. Setting it to any positive integer +means that on failure connection is retried that many times e.g. setting it +to 3 means total attempts to connect will be 4. + +Possible values: + +* Any integer value. 0 means connection is attempted only once """), ] diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index 9acf28b7ef61..1884a4bf1a3f 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -178,7 +178,8 @@ def get_client(context, admin=False): session = _get_session() client_args = dict(session=session, auth=auth_plugin, - global_request_id=context.global_id) + global_request_id=context.global_id, + connect_retries=CONF.neutron.http_retries) if CONF.neutron.url: # TODO(efried): Remove in Rocky diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py index 6a3aed85e68d..28ba86e97769 100644 --- a/nova/tests/unit/network/test_neutronv2.py +++ b/nova/tests/unit/network/test_neutronv2.py @@ -290,6 +290,15 @@ class TestNeutronClient(test.NoDBTestCase): exception.Unauthorized, client.list_networks) + def test_neutron_http_retries(self): + retries = 42 + self.flags(http_retries=retries, group='neutron') + my_context = context.RequestContext('userid', + uuids.my_tenant, + auth_token='token') + cl = neutronapi.get_client(my_context) + self.assertEqual(retries, cl.httpclient.connect_retries) + class _TestNeutronv2Common(test.TestCase): diff --git a/releasenotes/notes/neutron-connection-retries-c276010afe238abc.yaml b/releasenotes/notes/neutron-connection-retries-c276010afe238abc.yaml new file mode 100644 index 000000000000..9a0871f557bf --- /dev/null +++ b/releasenotes/notes/neutron-connection-retries-c276010afe238abc.yaml @@ -0,0 +1,12 @@ +--- +fixes: + - | + A new config option ``[neutron]http_retries`` is added which defaults to + 3. It controls how many times to retry a Neutron API call in response to a + HTTP connection failure. An example scenario where it will help is when a + deployment is using HAProxy and connections get closed after idle time. If + an incoming request tries to re-use a connection that is simultaneously + being torn down, a HTTP connection failure will occur and previously Nova + would fail the entire request. With retries, Nova can be more resilient in + this scenario and continue the request if a retry succeeds. Refer to + https://launchpad.net/bugs/1866937 for more details.