NSX: bump http_timeout to 30 seconds

We've seen that sometimes NSX takes longer then 10 seconds to return
in production setups under high bursts. Setting this value to 30 seconds
seems more appropriate and solves the issue at load.

Suggestion by: Jacob Cherkas

Change-Id: If604d5d52d15cc1165e19d20b38774dfecec275f
Closes-bug: 1325055

diff --git a/etc/neutron/plugins/vmware/nsx.ini b/etc/neutron/plugins/vmware/nsx.ini
index e270df57d6cdce6d10cd7245fe98486777954d7f..6ce36c04bf643bb6153e5e5e333f1552e224fc0f 100644 (file)
--- a/etc/neutron/plugins/vmware/nsx.ini
+++ b/etc/neutron/plugins/vmware/nsx.ini
@@ -10,7 +10,7 @@
 # req_timeout = 30
 
 # Time before aborting a request on an unresponsive controller
-# http_timeout = 10
+# http_timeout = 30
 
 # Maximum number of times a particular request should be retried
 # retries = 2

diff --git a/neutron/plugins/vmware/api_client/request.py b/neutron/plugins/vmware/api_client/request.py
index f43dff440f3b36f21a76a49f7f9a461c5e72a678..70e7dcef495988cd8ccced48c8b907948f8274a4 100644 (file)
--- a/neutron/plugins/vmware/api_client/request.py
+++ b/neutron/plugins/vmware/api_client/request.py
@@ -31,7 +31,7 @@ from neutron.plugins.vmware import api_client
 LOG = logging.getLogger(__name__)
 
 DEFAULT_REQUEST_TIMEOUT = 30
-DEFAULT_HTTP_TIMEOUT = 10
+DEFAULT_HTTP_TIMEOUT = 30
 DEFAULT_RETRIES = 2
 DEFAULT_REDIRECTS = 2
 DEFAULT_API_REQUEST_POOL_SIZE = 1000

diff --git a/neutron/plugins/vmware/common/config.py b/neutron/plugins/vmware/common/config.py
index 848d6bded78caeb04f424a14869d70f8050d2c2e..c75f982a63055f710f6091dee3853d54fb31441d 100644 (file)
--- a/neutron/plugins/vmware/common/config.py
+++ b/neutron/plugins/vmware/common/config.py
@@ -116,7 +116,7 @@ connection_opts = [
                default=30,
                help=_('Total time limit for a cluster request')),
     cfg.IntOpt('http_timeout',
-               default=10,
+               default=30,
                help=_('Time before aborting a request')),
     cfg.IntOpt('retries',
                default=2,

diff --git a/neutron/tests/unit/vmware/test_nsx_opts.py b/neutron/tests/unit/vmware/test_nsx_opts.py
index a5829810c63f41c29f16e704120a2e988ababe93..6bdfc3408793031d156175955c84505e8d34adb0 100644 (file)
--- a/neutron/tests/unit/vmware/test_nsx_opts.py
+++ b/neutron/tests/unit/vmware/test_nsx_opts.py
@@ -125,7 +125,7 @@ class ConfigurationTest(base.BaseTestCase):
         self.assertEqual('admin', cfg.CONF.nsx_user)
         self.assertEqual('admin', cfg.CONF.nsx_password)
         self.assertEqual(30, cfg.CONF.req_timeout)
-        self.assertEqual(10, cfg.CONF.http_timeout)
+        self.assertEqual(30, cfg.CONF.http_timeout)
         self.assertEqual(2, cfg.CONF.retries)
         self.assertEqual(2, cfg.CONF.redirects)
         self.assertIsNone(cfg.CONF.nsx_controllers)