openstack/deb-python-eventlet
Code Issues Proposed changes

Revert "gh-274: Handle blocking I/O errors in GreenSocket"

Browse Source 
The commit broke tests on Python 3[1]:

======================================================================
FAIL: test_recv_into_timeout (tests.greenio_test.TestGreenSocket)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/eventlet/eventlet/tests/greenio_test.py", line 192, in test_recv_into_timeout
    self.fail("socket.timeout not raised")
AssertionError: socket.timeout not raised

This reverts commit 19035b1018.

[1] https://travis-ci.org/eventlet/eventlet/jobs/100720347
This commit is contained in:
Jakub Stasiak
2016-01-07 01:37:33 +01:00
parent 19035b1018
commit d62c080c1f
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
eventlet/greenio/base.py
View File

@@ -304,13 +304,13 @@ class GreenSocket(object):
"makefile instead", DeprecationWarning, stacklevel=2) "makefile instead", DeprecationWarning, stacklevel=2)
return self.makefile(*args, **kw) return self.makefile(*args, **kw)
def _recv_loop(self, recv_meth, *args): def recv(self, buflen, flags=0):
fd = self.fd fd = self.fd
if self.act_non_blocking: if self.act_non_blocking:
return recv_meth(*args) return fd.recv(buflen, flags)
while True: while True:
try: try:
return recv_meth(*args) return fd.recv(buflen, flags)
except socket.error as e: except socket.error as e:
if get_errno(e) in SOCKET_BLOCKING: if get_errno(e) in SOCKET_BLOCKING:
pass pass
@@ -328,28 +328,35 @@ class GreenSocket(object):
# Perhaps we should return '' instead? # Perhaps we should return '' instead?
raise EOFError() raise EOFError()
def recv(self, bufsize, flags=0): def recvfrom(self, *args):
return self._recv_loop(self.fd.recv, bufsize, flags) if not self.act_non_blocking:
self._trampoline(self.fd, read=True, timeout=self.gettimeout(),
timeout_exc=socket.timeout("timed out"))
return self.fd.recvfrom(*args)
def recvfrom(self, bufsize, flags=0): def recvfrom_into(self, *args):
return self._recv_loop(self.fd.recvfrom, bufsize, flags) if not self.act_non_blocking:
self._trampoline(self.fd, read=True, timeout=self.gettimeout(),
timeout_exc=socket.timeout("timed out"))
return self.fd.recvfrom_into(*args)
def recv_into(self, buffer, nbytes=0, flags=0): def recv_into(self, *args):
return self._recv_loop(self.fd.recv_into, buffer, nbytes, flags) if not self.act_non_blocking:
self._trampoline(self.fd, read=True, timeout=self.gettimeout(),
timeout_exc=socket.timeout("timed out"))
return self.fd.recv_into(*args)
def recvfrom_into(self, buffer, nbytes=0, flags=0): def send(self, data, flags=0):
return self._recv_loop(self.fd.recvfrom_into, buffer, nbytes, flags) fd = self.fd
def _send_loop(self, send_method, data, *args):
if self.act_non_blocking: if self.act_non_blocking:
return send_method(data, *args) return fd.send(data, flags)
# blocking socket behavior - sends all, blocks if the buffer is full # blocking socket behavior - sends all, blocks if the buffer is full
total_sent = 0 total_sent = 0
len_data = len(data) len_data = len(data)
while 1: while 1:
try: try:
total_sent += send_method(data[total_sent:], *args) total_sent += fd.send(data[total_sent:], flags)
except socket.error as e: except socket.error as e:
eno = get_errno(e) eno = get_errno(e)
if eno == errno.ENOTCONN or eno not in SOCKET_BLOCKING: if eno == errno.ENOTCONN or eno not in SOCKET_BLOCKING:
@@ -366,18 +373,16 @@ class GreenSocket(object):
return total_sent return total_sent
def send(self, data, flags=0):
return self._send_loop(self.fd.send, data, flags)
def sendto(self, data, address, flags=0):
return self._send_loop(self.fd.sendto, data, address, flags)
def sendall(self, data, flags=0): def sendall(self, data, flags=0):
tail = self.send(data, flags) tail = self.send(data, flags)
len_data = len(data) len_data = len(data)
while tail < len_data: while tail < len_data:
tail += self.send(data[tail:], flags) tail += self.send(data[tail:], flags)
def sendto(self, *args):
self._trampoline(self.fd, write=True)
return self.fd.sendto(*args)
def setblocking(self, flag): def setblocking(self, flag):
if flag: if flag:
self.act_non_blocking = False self.act_non_blocking = False