x/vmware-nsx
Code Issues Proposed changes

Merge "NSX: Correct default timeout params"

Browse Source
This commit is contained in:
Jenkins 2014-08-04 02:17:06 +00:00 committed by Gerrit Code Review
commit 8bfd8b4b18
15 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/neutron/plugins/vmware/nsx.ini
View File

@ -5,12 +5,8 @@
# Password for NSX controller # Password for NSX controller
# nsx_password = admin # nsx_password = admin
# Total time limit for a cluster request # Time before aborting a request on an unresponsive controller (Seconds)
# (including retries across different controllers) # http_timeout = 75
# req_timeout = 30
# Time before aborting a request on an unresponsive controller
# http_timeout = 30
# Maximum number of times a particular request should be retried # Maximum number of times a particular request should be retried
# retries = 2 # retries = 2

8
neutron/plugins/vmware/api_client/client.py
View File

@ -35,12 +35,9 @@ class NsxApiClient(eventlet_client.EventletApiClient):
gen_timeout=base.GENERATION_ID_TIMEOUT, gen_timeout=base.GENERATION_ID_TIMEOUT,
use_https=True, use_https=True,
connect_timeout=base.DEFAULT_CONNECT_TIMEOUT, connect_timeout=base.DEFAULT_CONNECT_TIMEOUT,
request_timeout=30, http_timeout=10, retries=2, redirects=2): http_timeout=75, retries=2, redirects=2):
'''Constructor. Adds the following: '''Constructor. Adds the following:
:param request_timeout: all operations (including retries, redirects
from unresponsive controllers, etc) should finish within this
timeout.
:param http_timeout: how long to wait before aborting an :param http_timeout: how long to wait before aborting an
unresponsive controller (and allow for retries to another unresponsive controller (and allow for retries to another
controller in the cluster) controller in the cluster)
@ -53,7 +50,7 @@ class NsxApiClient(eventlet_client.EventletApiClient):
gen_timeout=gen_timeout, use_https=use_https, gen_timeout=gen_timeout, use_https=use_https,
connect_timeout=connect_timeout) connect_timeout=connect_timeout)
self._request_timeout = request_timeout self._request_timeout = http_timeout * retries
self._http_timeout = http_timeout self._http_timeout = http_timeout
self._retries = retries self._retries = retries
self._redirects = redirects self._redirects = redirects
@ -85,7 +82,6 @@ class NsxApiClient(eventlet_client.EventletApiClient):
g = eventlet_request.GenericRequestEventlet( g = eventlet_request.GenericRequestEventlet(
self, method, url, body, content_type, auto_login=True, self, method, url, body, content_type, auto_login=True,
request_timeout=self._request_timeout,
http_timeout=self._http_timeout, http_timeout=self._http_timeout,
retries=self._retries, redirects=self._redirects) retries=self._retries, redirects=self._redirects)
g.start() g.start()

8
neutron/plugins/vmware/api_client/eventlet_request.py
View File

@ -48,7 +48,6 @@ class EventletApiRequest(request.ApiRequest):
def __init__(self, client_obj, url, method="GET", body=None, def __init__(self, client_obj, url, method="GET", body=None,
headers=None, headers=None,
request_timeout=request.DEFAULT_REQUEST_TIMEOUT,
retries=request.DEFAULT_RETRIES, retries=request.DEFAULT_RETRIES,
auto_login=True, auto_login=True,
redirects=request.DEFAULT_REDIRECTS, redirects=request.DEFAULT_REDIRECTS,
@ -59,7 +58,7 @@ class EventletApiRequest(request.ApiRequest):
self._method = method self._method = method
self._body = body self._body = body
self._headers = headers or {} self._headers = headers or {}
self._request_timeout = request_timeout self._request_timeout = http_timeout * retries
self._retries = retries self._retries = retries
self._auto_login = auto_login self._auto_login = auto_login
self._redirects = redirects self._redirects = redirects
@ -109,7 +108,7 @@ class EventletApiRequest(request.ApiRequest):
'''Return a copy of this request instance.''' '''Return a copy of this request instance.'''
return EventletApiRequest( return EventletApiRequest(
self._api_client, self._url, self._method, self._body, self._api_client, self._url, self._method, self._body,
self._headers, self._request_timeout, self._retries, self._headers, self._retries,
self._auto_login, self._redirects, self._http_timeout) self._auto_login, self._redirects, self._http_timeout)
def _run(self): def _run(self):
@ -220,14 +219,13 @@ class GenericRequestEventlet(EventletApiRequest):
def __init__(self, client_obj, method, url, body, content_type, def __init__(self, client_obj, method, url, body, content_type,
auto_login=False, auto_login=False,
request_timeout=request.DEFAULT_REQUEST_TIMEOUT,
http_timeout=request.DEFAULT_HTTP_TIMEOUT, http_timeout=request.DEFAULT_HTTP_TIMEOUT,
retries=request.DEFAULT_RETRIES, retries=request.DEFAULT_RETRIES,
redirects=request.DEFAULT_REDIRECTS): redirects=request.DEFAULT_REDIRECTS):
headers = {"Content-Type": content_type} headers = {"Content-Type": content_type}
super(GenericRequestEventlet, self).__init__( super(GenericRequestEventlet, self).__init__(
client_obj, url, method, body, headers, client_obj, url, method, body, headers,
request_timeout=request_timeout, retries=retries, retries=retries,
auto_login=auto_login, redirects=redirects, auto_login=auto_login, redirects=redirects,
http_timeout=http_timeout) http_timeout=http_timeout)

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

@ -30,7 +30,6 @@ from neutron.plugins.vmware import api_client
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
DEFAULT_REQUEST_TIMEOUT = 30
DEFAULT_HTTP_TIMEOUT = 30 DEFAULT_HTTP_TIMEOUT = 30
DEFAULT_RETRIES = 2 DEFAULT_RETRIES = 2
DEFAULT_REDIRECTS = 2 DEFAULT_REDIRECTS = 2

1
neutron/plugins/vmware/check_nsx_config.py
View File

@ -100,7 +100,6 @@ def main():
print("\tmax_lp_per_bridged_ls: %s" % cfg.CONF.NSX.max_lp_per_bridged_ls) print("\tmax_lp_per_bridged_ls: %s" % cfg.CONF.NSX.max_lp_per_bridged_ls)
print("\tmax_lp_per_overlay_ls: %s" % cfg.CONF.NSX.max_lp_per_overlay_ls) print("\tmax_lp_per_overlay_ls: %s" % cfg.CONF.NSX.max_lp_per_overlay_ls)
print("----------------------- Cluster Options -----------------------") print("----------------------- Cluster Options -----------------------")
print("\trequested_timeout: %s" % cfg.CONF.req_timeout)
print("\tretries: %s" % cfg.CONF.retries) print("\tretries: %s" % cfg.CONF.retries)
print("\tredirects: %s" % cfg.CONF.redirects) print("\tredirects: %s" % cfg.CONF.redirects)
print("\thttp_timeout: %s" % cfg.CONF.http_timeout) print("\thttp_timeout: %s" % cfg.CONF.http_timeout)

5
neutron/plugins/vmware/common/config.py
View File

@ -110,11 +110,8 @@ connection_opts = [
deprecated_name='nvp_password', deprecated_name='nvp_password',
secret=True, secret=True,
help=_('Password for NSX controllers in this cluster')), help=_('Password for NSX controllers in this cluster')),
cfg.IntOpt('req_timeout',
default=30,
help=_('Total time limit for a cluster request')),
cfg.IntOpt('http_timeout', cfg.IntOpt('http_timeout',
default=30, default=75,
help=_('Time before aborting a request')), help=_('Time before aborting a request')),
cfg.IntOpt('retries', cfg.IntOpt('retries',
default=2, default=2,

1
neutron/plugins/vmware/common/nsx_utils.py
View File

@ -210,7 +210,6 @@ def create_nsx_cluster(cluster_opts, concurrent_connections, gen_timeout):
for ctrl in cluster.nsx_controllers] for ctrl in cluster.nsx_controllers]
cluster.api_client = client.NsxApiClient( cluster.api_client = client.NsxApiClient(
api_providers, cluster.nsx_user, cluster.nsx_password, api_providers, cluster.nsx_user, cluster.nsx_password,
request_timeout=cluster.req_timeout,
http_timeout=cluster.http_timeout, http_timeout=cluster.http_timeout,
retries=cluster.retries, retries=cluster.retries,
redirects=cluster.redirects, redirects=cluster.redirects,

2
neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py
View File

@ -68,7 +68,7 @@ class ApiRequestEventletTest(base.BaseTestCase):
def test_apirequest_start(self): def test_apirequest_start(self):
for i in range(10): for i in range(10):
a = request.EventletApiRequest( a = request.EventletApiRequest(
self.client, self.url, request_timeout=0.1) self.client, self.url)
a._handle_request = mock.Mock() a._handle_request = mock.Mock()
a.start() a.start()
eventlet.greenthread.sleep(0.1) eventlet.greenthread.sleep(0.1)

1
neutron/tests/unit/vmware/etc/nsx.ini.agentless.test
View File

@ -8,7 +8,6 @@ default_l3_gw_service_uuid = whatever
default_l2_gw_service_uuid = whatever default_l2_gw_service_uuid = whatever
default_service_cluster_uuid = whatever default_service_cluster_uuid = whatever
default_interface_name = whatever default_interface_name = whatever
req_timeout = 14
http_timeout = 13 http_timeout = 13
redirects = 12 redirects = 12
retries = 11 retries = 11

1
neutron/tests/unit/vmware/etc/nsx.ini.combined.test
View File

@ -8,7 +8,6 @@ default_l3_gw_service_uuid = whatever
default_l2_gw_service_uuid = whatever default_l2_gw_service_uuid = whatever
default_service_cluster_uuid = whatever default_service_cluster_uuid = whatever
default_interface_name = whatever default_interface_name = whatever
req_timeout = 14
http_timeout = 13 http_timeout = 13
redirects = 12 redirects = 12
retries = 11 retries = 11

1
neutron/tests/unit/vmware/etc/nsx.ini.full.test
View File

@ -7,7 +7,6 @@ nsx_password = bar
default_l3_gw_service_uuid = whatever default_l3_gw_service_uuid = whatever
default_l2_gw_service_uuid = whatever default_l2_gw_service_uuid = whatever
default_interface_name = whatever default_interface_name = whatever
req_timeout = 14
http_timeout = 13 http_timeout = 13
redirects = 12 redirects = 12
retries = 11 retries = 11

1
neutron/tests/unit/vmware/etc/nvp.ini.full.test
View File

@ -7,7 +7,6 @@ nvp_password = bar
default_l3_gw_service_uuid = whatever default_l3_gw_service_uuid = whatever
default_l2_gw_service_uuid = whatever default_l2_gw_service_uuid = whatever
default_interface_name = whatever default_interface_name = whatever
req_timeout = 4
http_timeout = 3 http_timeout = 3
redirects = 2 redirects = 2
retries = 2 retries = 2

4
neutron/tests/unit/vmware/nsxlib/base.py
View File

@ -47,7 +47,7 @@ class NsxlibTestCase(base.BaseTestCase):
self.fake_cluster.api_client = client.NsxApiClient( self.fake_cluster.api_client = client.NsxApiClient(
('1.1.1.1', '999', True), ('1.1.1.1', '999', True),
self.fake_cluster.nsx_user, self.fake_cluster.nsx_password, self.fake_cluster.nsx_user, self.fake_cluster.nsx_password,
self.fake_cluster.req_timeout, self.fake_cluster.http_timeout, self.fake_cluster.http_timeout,
self.fake_cluster.retries, self.fake_cluster.redirects) self.fake_cluster.retries, self.fake_cluster.redirects)
super(NsxlibTestCase, self).setUp() super(NsxlibTestCase, self).setUp()
@ -81,7 +81,7 @@ class NsxlibNegativeBaseTestCase(base.BaseTestCase):
self.fake_cluster.api_client = client.NsxApiClient( self.fake_cluster.api_client = client.NsxApiClient(
('1.1.1.1', '999', True), ('1.1.1.1', '999', True),
self.fake_cluster.nsx_user, self.fake_cluster.nsx_password, self.fake_cluster.nsx_user, self.fake_cluster.nsx_password,
self.fake_cluster.req_timeout, self.fake_cluster.http_timeout, self.fake_cluster.http_timeout,
self.fake_cluster.retries, self.fake_cluster.redirects) self.fake_cluster.retries, self.fake_cluster.redirects)
super(NsxlibNegativeBaseTestCase, self).setUp() super(NsxlibNegativeBaseTestCase, self).setUp()

6
neutron/tests/unit/vmware/test_nsx_opts.py
View File

@ -45,7 +45,6 @@ class NSXClusterTest(base.BaseTestCase):
'default_l2_gw_service_uuid': uuidutils.generate_uuid(), 'default_l2_gw_service_uuid': uuidutils.generate_uuid(),
'nsx_user': 'foo', 'nsx_user': 'foo',
'nsx_password': 'bar', 'nsx_password': 'bar',
'req_timeout': 45,
'http_timeout': 25, 'http_timeout': 25,
'retries': 7, 'retries': 7,
'redirects': 23, 'redirects': 23,
@ -89,7 +88,6 @@ class ConfigurationTest(base.BaseTestCase):
self.assertEqual(cluster.nsx_password, 'bar') self.assertEqual(cluster.nsx_password, 'bar')
def _assert_extra_options(self, cluster): def _assert_extra_options(self, cluster):
self.assertEqual(14, cluster.req_timeout)
self.assertEqual(13, cluster.http_timeout) self.assertEqual(13, cluster.http_timeout)
self.assertEqual(12, cluster.redirects) self.assertEqual(12, cluster.redirects)
self.assertEqual(11, cluster.retries) self.assertEqual(11, cluster.retries)
@ -124,8 +122,7 @@ class ConfigurationTest(base.BaseTestCase):
self.assertIsNone(cfg.CONF.default_tz_uuid) self.assertIsNone(cfg.CONF.default_tz_uuid)
self.assertEqual('admin', cfg.CONF.nsx_user) self.assertEqual('admin', cfg.CONF.nsx_user)
self.assertEqual('admin', cfg.CONF.nsx_password) self.assertEqual('admin', cfg.CONF.nsx_password)
self.assertEqual(30, cfg.CONF.req_timeout) self.assertEqual(75, cfg.CONF.http_timeout)
self.assertEqual(30, cfg.CONF.http_timeout)
self.assertEqual(2, cfg.CONF.retries) self.assertEqual(2, cfg.CONF.retries)
self.assertEqual(2, cfg.CONF.redirects) self.assertEqual(2, cfg.CONF.redirects)
self.assertIsNone(cfg.CONF.nsx_controllers) self.assertIsNone(cfg.CONF.nsx_controllers)
@ -247,7 +244,6 @@ class OldNVPConfigurationTest(base.BaseTestCase):
cluster = plugin.cluster cluster = plugin.cluster
# Verify old nvp_* params have been fully parsed # Verify old nvp_* params have been fully parsed
self._assert_required_options(cluster) self._assert_required_options(cluster)
self.assertEqual(4, cluster.req_timeout)
self.assertEqual(3, cluster.http_timeout) self.assertEqual(3, cluster.http_timeout)
self.assertEqual(2, cluster.retries) self.assertEqual(2, cluster.retries)
self.assertEqual(2, cluster.redirects) self.assertEqual(2, cluster.redirects)

1
neutron/tests/unit/vmware/test_nsx_sync.py
View File

@ -282,7 +282,6 @@ class SyncTestCase(base.BaseTestCase):
self.fake_cluster.api_client = client.NsxApiClient( self.fake_cluster.api_client = client.NsxApiClient(
('1.1.1.1', '999', True), ('1.1.1.1', '999', True),
self.fake_cluster.nsx_user, self.fake_cluster.nsx_password, self.fake_cluster.nsx_user, self.fake_cluster.nsx_password,
request_timeout=self.fake_cluster.req_timeout,
http_timeout=self.fake_cluster.http_timeout, http_timeout=self.fake_cluster.http_timeout,
retries=self.fake_cluster.retries, retries=self.fake_cluster.retries,
redirects=self.fake_cluster.redirects) redirects=self.fake_cluster.redirects)