natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Brandon Williams 2022-01-11 08:24:27 -06:00
parent 1a05fcf52b b17d701c58
commit aecac82027
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -30,6 +30,7 @@ Merged from 3.11:
* Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
* Make assassinate more resilient to missing tokens (CASSANDRA-16847)
Merged from 3.0:
* Fix abort when window resizing during cqlsh COPY (CASSANDRA-15230)
* Fix slow keycache load which blocks startup for tables with many sstables (CASSANDRA-14898)
* Fix rare NPE caused by batchlog replay / node decomission races (CASSANDRA-17049)
* Allow users to view permissions of the roles they created (CASSANDRA-16902)

10
pylib/cqlshlib/copyutil.py
View File

@ -197,7 +197,15 @@ class ReceivingChannels(object):
Implementation of the recv method for Linux, where select is available. Receive an object from
all pipes that are ready for reading without blocking.
"""
readable, _, _ = select(self._readers, [], [], timeout)
while True:
try:
readable, _, _ = select(self._readers, [], [], timeout)
except select.error as exc:
# Do not abort on window resize:
if exc[0] != errno.EINTR:
raise
else:
break
for r in readable:
with self._rlocks_by_readers[r]:
try: