openstack/cinder
Code Issues Proposed changes

Merge "Some tcp configuration paramters are ignored"

Browse Source
This commit is contained in:
Jenkins 2014-09-18 12:56:34 +00:00 committed by Gerrit Code Review
commit 5dafa0b2e7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/wsgi.py
View File

@ -39,6 +39,7 @@ from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.openstack.common import excutils from cinder.openstack.common import excutils
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import network_utils
from cinder import utils from cinder import utils
@ -210,8 +211,11 @@ class Server(object):
socket.SO_REUSEADDR, 1) socket.SO_REUSEADDR, 1)
# sockets can hang around forever without keepalive # sockets can hang around forever without keepalive
dup_socket.setsockopt(socket.SOL_SOCKET, network_utils.set_tcp_keepalive(dup_socket,
socket.SO_KEEPALIVE, 1) CONF.tcp_keepalive,
CONF.tcp_keepidle,
CONF.tcp_keepalive_count,
CONF.tcp_keepalive_interval)
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():