openstack
/
neutron
Code Issues Proposed changes

Merge "Eventlet green threads not released back to pool" into stable/icehouse

This commit is contained in:
Jenkins 2015-03-12 18:18:47 +00:00 committed by Gerrit Code Review
parent 4b0a0be4a4 4cdbefc202
commit 307db0c3d3
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/neutron.conf
View File

@ -264,6 +264,12 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# enabled for various plugins for compatibility.
# rpc_workers = 0
# wsgi keepalive option. Determines if connections are allowed to be held open
# by clients after a request is fulfilled. A value of False will ensure that
# the socket connection will be explicitly closed once a response has been
# sent to the client.
# wsgi_keep_alive = True
# Sets the value of TCP_KEEPIDLE in seconds to use for each server socket when
# starting API server. Not supported on OS X.
# tcp_keepidle = 600

10
neutron/wsgi.py
View File

@ -76,6 +76,13 @@ socket_opts = [
default=None,
help=_("Private key file to use when starting "
"the server securely")),
cfg.BoolOpt('wsgi_keep_alive',
default=True,
help=_("Determines if connections are allowed to be held "
"open by clients after a request is fulfilled. A "
"value of False will ensure that the socket "
"connection will be explicitly closed once a response "
"has been sent to the client.")),
]
CONF = cfg.CONF
@ -246,7 +253,8 @@ class Server(object):
def _run(self, application, socket):
"""Start a WSGI server in a new green thread."""
eventlet.wsgi.server(socket, application, custom_pool=self.pool,
log=logging.WritableLogger(LOG))
log=logging.WritableLogger(LOG),
keepalive=CONF.wsgi_keep_alive)
class Middleware(object):