Commit Graph

27682 Commits

Author SHA1 Message Date
Brandon Williams 7150cc5b99 Suppress CVE-2023-34462
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18649
2023-07-06 09:58:19 -05:00
Brandon Williams 822589e382 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-06 09:50:50 -05:00
Brandon Williams d302b837b2 Suppress CVE-2022-45688
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18643
2023-07-06 09:49:56 -05:00
Brandon Williams 0c79b2857a Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-05 10:07:47 -05:00
Brandon Williams 00cf31882b Ninja fix my bad merge 2023-07-05 10:07:34 -05:00
Stefan Miklosovic 0a53770ddc
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-07-04 13:45:30 +02:00
Vincent White 028ea02a4a
Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true
patch by Vincent White; reviewed by Stefan Miklosovic and Branimir Lambov for CASSANDRA-14204

Co-authored-by: Stefan Miklosovic <smiklosovic@apache.org>
2023-07-04 10:37:29 +02:00
Stefan Miklosovic b099aae3f0
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-28 16:27:19 +02:00
Stefan Miklosovic b6fdc80456
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-28 16:20:05 +02:00
Stefan Miklosovic 4ea7bb25b4
Add support for AWS Ec2 IMDSv2
patch by Stefan Miklosovic; reviewed by Jacek Lewandowski and Brandon Williams for CASSANDRA-16555

Co-authored-by: Jacek Lewandowski <lewandowski.jacek@gmail.com>
Co-authored-by: Paul Rütter <paul@blueconic.com>
2023-06-28 16:08:39 +02:00
Brandon Williams 0621658acd Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-28 06:05:43 -05:00
Brandon Williams 293f14cf36 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-28 06:04:26 -05:00
Brandon Williams de7b1584f8 Suppress CVE-2023-35116
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18630
2023-06-28 06:03:20 -05:00
Stefan Miklosovic 04fd3747cf
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-26 14:06:40 +02:00
Stefan Miklosovic 55dc5b43f1
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-26 14:01:24 +02:00
Stefan Miklosovic a00d1de441
Pass taskId from CompactionTask to system.compaction_history
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-12183
2023-06-26 13:55:49 +02:00
Brandon Williams 776b33753b Upgrade snappy to 1.1.10.1
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18608
2023-06-26 06:06:38 -05:00
Brandon Williams 72b1949157 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-26 06:05:24 -05:00
Brandon Williams b15a7da208 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-26 06:04:45 -05:00
Brandon Williams d99bccd649 Suppress CVE-2023-34455, CVE-2023-34454, CVE-2023-34453
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18608
2023-06-26 06:03:13 -05:00
Brandon Williams bc3700da05 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-21 18:00:01 -05:00
Brandon Williams 254991750c Add missing changes 2023-06-21 17:59:51 -05:00
Brandon Williams 76d11fdf51 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-21 06:26:43 -05:00
Brandon Williams ece247b6ee Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-21 06:26:30 -05:00
Stefan Podkowinski e67fa69114 Remove hard-coded SSL cipher suites and protocols
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-10508

backported in CASSANDRA-18575 by German Eichberger; reviewed by
brandonwilliams
2023-06-21 06:25:18 -05:00
Maciej Sokol 92d0a40c96
Fix assertion error when describing mv as table
patch by Maciej Sokol; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18596
2023-06-19 17:08:12 +02:00
Stefan Miklosovic 49dba85ec8
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-15 13:16:44 +02:00
Cameron Zemek 64d953fdca
Wait for live endpoints in gossip waiting to settle
patch by Cameron Zemek; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-18543
2023-06-15 12:59:13 +02:00
Daniel Jatnieks c37bcbf7e9 Include TLSv1.2 in negotiatedProtocolMustBeAcceptedProtocolTest
Add a comment about the use of disabled TLSv1.1 with JDK 8 and higher to negotiatedProtocolMustBeAcceptedProtocolTest

Patch by Dan Jatnieks; reviewed by Ekaterina Dimitrova and Brandon Williams for CASSANDRA-18540
2023-06-14 14:00:03 -04:00
Brandon Williams 2fcdaa5b76 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-14 11:35:22 -05:00
ningzi.zhan 1eccb2bc1f Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column
Patch by Ningzi Zhan and Tomasz Lasica; reviewed by brandonwilliams,
edimitrova and Maxwell Guo for CASSANDRA-17818

Co-Authored-By: Tomek Lasica <tomasz.lasica@datastax.com>
2023-06-14 11:34:03 -05:00
Jacek Lewandowski 5143bd81e8 Track the amount of read data per row
If an sstable is corrupted in a nasty way, we may read invalid cell sizes and try to read much more data for a row than we should. In rare scenarios this can lead even to OOMs.

This simple fix adds tracking and limiting the amount of data that is read per row. Row has its size stored in preamble which can be used as a limit. If the deserialization code tries to read more than that, it will simply fail with EOF which will prevent more serious problems later.

Patch by Jacek Lewandowski; reviewed by Berenguer Blasi and Maxwell Guo for CASSANDRA-18513

# Conflicts:
#	src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
2023-06-12 11:26:02 +02:00
Bereng c94eb0e37b Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Generate.sh -s param to skip autodetection of tests
2023-06-12 10:01:49 +02:00
Bereng 7de3e61d75 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Generate.sh -s param to skip autodetection of tests
2023-06-12 10:01:00 +02:00
Bereng c91e2714b9 Generate.sh -s param to skip autodetection of tests
patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-18553
2023-06-12 09:58:58 +02:00
Andrés de la Peña 2393bb16f3 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-07 11:04:52 +01:00
Andrés de la Peña 3855c8a194 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-07 11:04:01 +01:00
Derek Chen-Becker 8d3c30dde4 Validate the comparison git branch when generating CircleCI configs
Allow the user to use a flag to specify a non-default comparison git
branch when detecting changed unit tests to repeat.

Patch by Derek Chen-Becker; reviewed by Andrés de la Peña and Berenguer Blasi for CASSANDRA-17997
2023-06-07 11:03:00 +01:00
Stefan Miklosovic f368b9dc1e
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-06 16:14:34 +02:00
mghildiy 03da864bab
Add keyspace and table name to exception message during ColumnSubselection deserialization
patch by Manish Ghildiyal; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18346
2023-06-06 16:00:26 +02:00
rgitt 5655a33bc0
Fix Down nodes counter in nodetool describecluster
patch by Goel Ranju; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18512
2023-06-05 15:56:38 +02:00
Brandon Williams be8cd8ab6b Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-05 05:58:40 -05:00
Brandon Williams 9c970cc117 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-05 05:58:01 -05:00
Brandon Williams e28ef4089e Suppress CVE-2023-2976
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18562
2023-06-05 05:56:51 -05:00
Brandon Williams fb41fb46fc Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-01 15:30:04 -05:00
Brandon Williams 572db17350 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-01 15:29:58 -05:00
Brandon Williams f72df5449a Merge branch 'cassandra-2.2' into cassandra-3.0 2023-06-01 15:29:53 -05:00
Brandon Williams aa671e8f07 remove dh_python use from Debian packaging
Patch by brandonwilliams; reviewed by mck for CASSANDRA-18558
2023-06-01 15:29:42 -05:00
Brandon Williams eb6a45fe6d Merge branch 'cassandra-3.11' into cassandra-4.0 2023-06-01 15:02:22 -05:00
Brandon Williams 1923e6955a Merge branch 'cassandra-3.0' into cassandra-3.11 2023-06-01 15:00:33 -05:00