Skip to content

Fix EventletConnection close() race causing EBADF errors #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dkropachev wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix EventletConnection close() race causing EBADF errors #702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cassandra/io/eventletreactor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ def close(self):
msg = "Connection to %s was closed" % self.endpoint
if self.last_error:
msg += ": %s" % (self.last_error,)
self.error_all_requests(ConnectionShutdown(msg))
shutdown_exc = ConnectionShutdown(msg)
self.error_all_requests(shutdown_exc)
if not self.connected_event.is_set():
self.last_error = shutdown_exc
# don't leave in-progress operations hanging
self.connected_event.set()

Expand All @@ -162,6 +165,8 @@ def handle_write(self):
next_msg = self._write_queue.get()
self._socket.sendall(next_msg)
except socket.error as err:
if self.is_closed or self.is_defunct:
return
log.debug("Exception during socket send for %s: %s", self, err)
self.defunct(err)
return # Leave the write loop
Expand All @@ -174,6 +179,8 @@ def handle_read(self):
buf = self._socket.recv(self.in_buffer_size)
self._iobuf.write(buf)
except socket.error as err:
if self.is_closed or self.is_defunct:
return
log.debug("Exception during socket recv for %s: %s",
self, err)
self.defunct(err)
Expand All @@ -185,6 +192,8 @@ def handle_read(self):
self.process_io_buffer()
else:
log.debug("Connection %s closed by server", self)
self.last_error = ConnectionShutdown(
"Connection to %s was closed by server" % self.endpoint)
self.close()
return

Expand Down
Loading