You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2022/01/11 14:27:03 UTC
[cassandra] branch cassandra-4.0 updated (1a05fcf -> aecac82)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 1a05fcf Deduplicate warnings for deprecated parameters (changed names) patch by Ekaterina Dimitrova; reviewed by Caleb Rackliffe for CASSANDRA-17160
new 75e0e8c Fix cqlsh COPY abort on window resize
new b17d701 Merge branch 'cassandra-3.0' into cassandra-3.11
new aecac82 Merge branch 'cassandra-3.11' into cassandra-4.0
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit aecac820279c4aed2b8705f2213803ad84d51014
Merge: 1a05fcf b17d701
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Jan 11 08:24:27 2022 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 1d01ffb,382f786..c618000
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,17 +1,36 @@@
-3.11.12
- * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028)
+4.0.2
+ * Deduplicate warnings for deprecated parameters (changed names) (CASSANDRA-17160)
+ * Update ant-junit to version 1.10.12 (CASSANDRA-17218)
+ * Add droppable tombstone metrics to nodetool tablestats (CASSANDRA-16308)
+ * Fix disk failure triggered when enabling FQL on an unclean directory (CASSANDRA-17136)
+ * Fixed broken classpath when multiple jars in build directory (CASSANDRA-17129)
+ * DebuggableThreadPoolExecutor does not propagate client warnings (CASSANDRA-17072)
+ * internode_send_buff_size_in_bytes and internode_recv_buff_size_in_bytes have new names. Backward compatibility with the old names added (CASSANDRA-17141)
+ * Remove unused configuration parameters from cassandra.yaml (CASSANDRA-17132)
+ * Queries performed with NODE_LOCAL consistency level do not update request metrics (CASSANDRA-17052)
+ * Fix multiple full sources can be select unexpectedly for bootstrap streaming (CASSANDRA-16945)
+ * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131)
+ * Add backward compatibility for CQLSSTableWriter Date fields (CASSANDRA-17117)
+ * Push initial client connection messages to trace (CASSANDRA-17038)
+ * Correct the internode message timestamp if sending node has wrapped (CASSANDRA-16997)
+ * Avoid race causing us to return null in RangesAtEndpoint (CASSANDRA-16965)
+ * Avoid rewriting all sstables during cleanup when transient replication is enabled (CASSANDRA-16966)
+ * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987)
+ * Avoid trying to acquire 0 permits from the rate limiter when taking snapshot (CASSANDRA-16872)
+ * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
+ * Include SASI components to snapshots (CASSANDRA-15134)
+ * Fix missed wait latencies in the output of `nodetool tpstats -F` (CASSANDRA-16938)
+ * Remove all the state pollution between tests in SSTableReaderTest (CASSANDRA-16888)
+ * Delay auth setup until after gossip has settled to avoid unavailables on startup (CASSANDRA-16783)
+ * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
+ * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900)
+ * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
+Merged from 3.11:
* Add key validation to ssstablescrub (CASSANDRA-16969)
* Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
- * Include SASI components to snapshots (CASSANDRA-15134)
* Make assassinate more resilient to missing tokens (CASSANDRA-16847)
- * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
- * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
- * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835)
- * Fix ant-junit dependency issue (CASSANDRA-16827)
- * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
- * Avoid sending CDC column if not enabled (CASSANDRA-16770)
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)
diff --cc pylib/cqlshlib/copyutil.py
index 3bcd26a,b36fa83..3a20b42
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -197,7 -192,15 +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.select(self._readers, [], [], timeout)
- except select.error, exc:
++ 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:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org