diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-27 03:50:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-27 03:50:52 +0000 |
| commit | 5621f16fbfd335d3a451ec3f023cde3c2cb9e9fe (patch) | |
| tree | 24e509e92a6a5b49d53d7e4a47edb7c477ccd48a | |
| parent | c7031c784492ed4bdb4cca15c82920cd72cca2b7 (diff) | |
| parent | b57c024bfb5f542e0412f268038f38bf52e06456 (diff) | |
| download | cinder-5621f16fbfd335d3a451ec3f023cde3c2cb9e9fe.tar.gz | |
Merge "Eventlet green threads not released back to pool" into stable/juno
| -rw-r--r-- | cinder/wsgi.py | 8 | ||||
| -rw-r--r-- | etc/cinder/cinder.conf.sample | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cinder/wsgi.py b/cinder/wsgi.py index 77ddba6d5..56ebfd6ab 100644 --- a/cinder/wsgi.py +++ b/cinder/wsgi.py @@ -79,6 +79,11 @@ eventlet_opts = [ "max_header_line may need to be increased when using " "large tokens (typically those generated by the " "Keystone v3 API with big service catalogs)."), + cfg.BoolOpt('wsgi_keep_alive', + default=True, + help='If False, closes the client socket connection ' + 'explicitly. Setting it to True to maintain backward ' + 'compatibility. Recommended setting is set it to False.'), ] CONF = cfg.CONF @@ -229,7 +234,8 @@ class Server(object): 'site': self.app, 'protocol': self._protocol, 'custom_pool': self._pool, - 'log': self._wsgi_logger + 'log': self._wsgi_logger, + 'keepalive': CONF.wsgi_keep_alive } self._server = eventlet.spawn(**wsgi_kwargs) diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample index 615789417..359eeb847 100644 --- a/etc/cinder/cinder.conf.sample +++ b/etc/cinder/cinder.conf.sample @@ -305,6 +305,11 @@ # with big service catalogs). (integer value) #max_header_line=16384 +# If False, closes the client socket connection explicitly. +# Setting it to True to maintain backward compatibility. +# Recommended setting is set it to False. (boolean value) +#wsgi_keep_alive=true + # Sets the value of TCP_KEEPALIVE (True/False) for each server # socket. (boolean value) #tcp_keepalive=true |