openstack
/
neutron
Code Issues Proposed changes

Merge "NSX-mh: Failover controller connections on socket failures" into stable/juno

This commit is contained in:
Jenkins 2015-08-28 21:56:46 +00:00 committed by Gerrit Code Review
parent 61ab7a60e2 1baa2d7249
commit 8819c6983b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/vmware/api_client/eventlet_client.py
View File

@ -65,8 +65,8 @@ class EventletApiClient(base.ApiClientBase):
# Connection pool is a list of queues.
self._conn_pool = eventlet.queue.PriorityQueue()
self._next_conn_priority = 1
for host, port, is_ssl in api_providers:
for _ in range(concurrent_connections):
for _ in range(concurrent_connections):
for host, port, is_ssl in api_providers:
conn = self._create_connection(host, port, is_ssl)
self._conn_pool.put((self._next_conn_priority, conn))
self._next_conn_priority += 1

4
neutron/plugins/vmware/api_client/request.py
View File

@ -19,6 +19,7 @@ import abc
import copy
import eventlet
import httplib
import socket
import time
import six
@ -193,9 +194,12 @@ class ApiRequest(object):
'url': self._url, 'status': response.status})
raise Exception(_('Server error return: %s'), response.status)
return response
except socket.error:
is_conn_service_unavail = True
except Exception as e:
if isinstance(e, httplib.BadStatusLine):
msg = (_("Invalid server response"))
else:
msg = unicode(e)
if response is None: