openstack/swift
Code Issues Proposed changes

Merge "Use TCP_NODELAY on outgoing connections"

Browse Source
This commit is contained in:
Jenkins 2015-01-19 19:19:33 +00:00 committed by Gerrit Code Review
commit c3dadd94e0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swift/common/bufferedhttp.py
View File

@ -30,6 +30,7 @@ from swift import gettext_ as _
from urllib import quote from urllib import quote
import logging import logging
import time import time
import socket
from eventlet.green.httplib import CONTINUE, HTTPConnection, HTTPMessage, \ from eventlet.green.httplib import CONTINUE, HTTPConnection, HTTPMessage, \
HTTPResponse, HTTPSConnection, _UNKNOWN HTTPResponse, HTTPSConnection, _UNKNOWN
@ -105,7 +106,9 @@ class BufferedHTTPConnection(HTTPConnection):
def connect(self): def connect(self):
self._connected_time = time.time() self._connected_time = time.time()
return HTTPConnection.connect(self) ret = HTTPConnection.connect(self)
self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
return ret
def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0): def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
self._method = method self._method = method

4
test/unit/common/test_bufferedhttp.py
View File

@ -15,6 +15,8 @@
import unittest import unittest
import socket
from eventlet import spawn, Timeout, listen from eventlet import spawn, Timeout, listen
from swift.common import bufferedhttp from swift.common import bufferedhttp
@ -60,6 +62,8 @@ class TestBufferedHTTP(unittest.TestCase):
'x-header': 'value'}, 'x-header': 'value'},
query_string='omg&no=%7f') query_string='omg&no=%7f')
conn.send('REQUEST\r\n') conn.send('REQUEST\r\n')
self.assertTrue(conn.sock.getsockopt(socket.IPPROTO_TCP,
socket.TCP_NODELAY))
resp = conn.getresponse() resp = conn.getresponse()
body = resp.read() body = resp.read()
conn.close() conn.close()