Commit Graph

7857 Commits

Author SHA1 Message Date
Brandon Williams 1959502d8b Merge branch 'cassandra-5.0' into trunk 2023-09-12 06:14:09 -05:00
Brandon Williams 00c0cbb958 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-09-12 06:13:44 -05:00
Brandon Williams 3d220b5a6e Merge branch 'cassandra-4.0' into cassandra-4.1 2023-09-12 06:13:00 -05:00
Brandon Williams b2093ef321 Select automatic native port when starting the server in CQLTester
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18829
2023-09-12 06:11:44 -05:00
Jacek Lewandowski 759f2b2932 Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Set the delay to 0 for unit tests and fix GuardrailDiskUsageTest
  Nodetool paxos-only repair is no longer incremental
2023-09-12 11:07:09 +02:00
Jacek Lewandowski 30d540d797 Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Set the delay to 0 for unit tests and fix GuardrailDiskUsageTest
  Nodetool paxos-only repair is no longer incremental
2023-09-12 11:07:09 +02:00
Jacek Lewandowski b053027680 Set the delay to 0 for unit tests and fix GuardrailDiskUsageTest
Patch by Jacek Lewandowski; reviewed by Berenguer Blasi and Jeremiah Jordan for CASSANDRA-18821

# Conflicts:
#	test/distributed/org/apache/cassandra/distributed/test/ColumnMaskTest.java
#	test/unit/org/apache/cassandra/cql3/CQLTester.java
2023-09-12 11:07:08 +02:00
Andrés de la Peña a67f4904f7 Merge branch 'cassandra-5.0' into trunk 2023-09-11 16:49:29 +01:00
Andrés de la Peña c9b934df67 Fix MixedModeAvailabilityTest
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-18564
2023-09-11 16:44:50 +01:00
Brandon Williams e1ddc34f58 Merge branch 'cassandra-5.0' into trunk 2023-09-08 09:08:49 -05:00
Brandon Williams 4093be5295 Nodetool paxos-only repair is no longer incremental
Patch by Ningzi Zhan; reviewed by brandonwilliams, jlewandowski, and
Maxwell Guo for CASSANDRA-18466
2023-09-08 09:07:34 -05:00
Brandon Williams 725655dda2 Nodetool paxos-only repair is no longer incremental
Patch by Ningzi Zhan; reviewed by brandonwilliams, jlewandowski, and
Maxwell Guo for CASSANDRA-18466
2023-09-08 09:05:07 -05:00
Andrés de la Peña 1ba458c900 Merge branch 'cassandra-5.0' into trunk 2023-09-07 11:52:02 +01:00
Mike Adamson 9ce86e0ff8 SAI result retriever is filtering too many rows
This patch fixes a bug in the SegmentMetadata that
was only storing the partition key for min and max
primary keys for a segment. It also contains some
refactoring of the PrimaryKey to remove the deferred
loading of PrimaryKeys by the PrimaryKeyMaps.

Patch by Mike Adamson; reviewed by Caleb Rackliffe and Andrés de la Peña for CASSANDRA-18734
2023-09-07 11:50:08 +01:00
Daniel Jatnieks 0b7310c010
Fix FailingRepairTest by making sure Gossip is started before each test
patch by Daniel Jatnieks; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18366
2023-09-04 10:03:22 +02:00
Bereng bd7dc322d8 Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Flaky test: org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest
2023-09-04 09:22:55 +02:00
Bereng 52a8d2947a Flaky test: org.apache.cassandra.cql3.validation.operations.InsertUpdateIfConditionTest
patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-18393
2023-09-04 09:20:34 +02:00
Mick Semb Wever 1c3c5008f9
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Missing license info and headers
2023-08-31 22:44:38 +02:00
Mick Semb Wever 865954fd99
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Missing license info and headers
2023-08-31 22:43:33 +02:00
Mick Semb Wever 20125c5053
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Missing license info and headers
2023-08-31 22:41:56 +02:00
Jon Meredith 16dc2a2393 Merge branch 'cassandra-5.0' into trunk 2023-08-29 10:44:00 -06:00
Jon Meredith d4d0abcd03 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-29 10:42:53 -06:00
Jon Meredith bde4fa0013 Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock
patch by Jon Meredith; reviewed by Caleb Rackliffe, David Capwell for CASSANDRA-18733
2023-08-29 10:42:03 -06:00
Jon Meredith 70766c7ae9 Merge branch 'cassandra-5.0' into trunk 2023-08-28 15:38:36 -06:00
Jon Meredith 24cfe27ea5 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-28 15:37:25 -06:00
Jon Meredith 251ae80bb0 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-28 15:34:34 -06:00
Francisco Guerrero 6ffa43f68b Support Dynamic Port Allocation for in-jvm dtest framework
patch by Francisco Guerrero; reviewed by Dinesh Joshi, Jon Meredith, Yifan Cai for CASSANDRA-18722
2023-08-28 15:29:14 -06:00
Brandon Williams 7750a9430b Merge branch 'cassandra-5.0' into trunk 2023-08-28 09:49:24 -05:00
Brandon Williams b670b7b0c8 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-28 09:48:18 -05:00
Derek Chen-Becker 5e2985f10e Ensure unit tests honor tmp.dir
Modify unit tests so that any files created are rooted in the directory
specified by the "tmp.dir" Ant property. Ant already passes the value of
tmp.dir to the JVM's java.io.tmpdir parameter, so the primary changes are
to make use of Files.createTempDirectory to generate per-test work
directories. Also update the test checkstyle rules to catch any future
usage of hardcoded "/tmp".

Patch by Derek Chen-Becker; reviewed by bereng and brandonwilliams for CASSANDRA-18750
2023-08-28 09:47:13 -05:00
Brandon Williams 052a264741 Merge branch 'cassandra-5.0' into trunk 2023-08-28 06:14:45 -05:00
Brandon Williams c611632eb5 SamplingManager samples before cancelling.
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18065
2023-08-28 06:14:29 -05:00
Stefan Miklosovic 9e90ccc90f
Merge branch 'cassandra-5.0' into trunk 2023-08-28 10:04:05 +02:00
Stefan Miklosovic a9606c6f4b
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-28 09:58:41 +02:00
Andy Tolbert b47bee42d3
Allow empty keystore_password in encryption_options
patch by Andy Tolbert; reviewed by Jon Meredith and Stefan Miklosovic for CASSANDRA-18778
2023-08-28 09:47:54 +02:00
Jon Meredith 6fb82b75d5 Merge branch 'cassandra-5.0' into trunk 2023-08-24 16:45:40 -06:00
Jon Meredith d2f8e8e105 Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-24 16:44:48 -06:00
Jon Meredith ac3b356063 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-24 16:43:53 -06:00
Jon Meredith 4034fbb6dd Merge branch 'cassandra-3.11' into cassandra-4.0 2023-08-24 16:34:44 -06:00
Doug Rohrer c6d7d070c5 IsolatedJMX should not release all TCPEndpoints on instance shutdown
patch by Doug Rohrer; reviewed by Jon Meredith, Stefan Miklosovic for CASSANDRA-18725
2023-08-24 16:32:28 -06:00
Andrés de la Peña 4226cbbec6 Merge branch 'cassandra-5.0' into trunk 2023-08-24 10:14:40 +01:00
Andrés de la Peña b265b4658e Forbid SAI indexes with analysis options on primary key columns
patch by Andrés de la Peña; reviewed by Caleb Rackliffe for CASSANDRA-18782
2023-08-24 10:08:28 +01:00
Stefan Miklosovic 2df8875502
Merge branch 'cassandra-5.0' into trunk 2023-08-23 15:45:58 +02:00
Stefan Miklosovic 51018940f6
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-23 15:42:56 +02:00
Stefan Miklosovic 8666265521
Merge branch 'cassandra-4.0' into cassandra-4.1 2023-08-23 15:37:53 +02:00
Stefan Miklosovic d13b3ef61b
Merge branch 'cassandra-3.11' into cassandra-4.0 2023-08-23 15:33:00 +02:00
Stefan Miklosovic b1b9c04010
Merge branch 'cassandra-3.0' into cassandra-3.11 2023-08-23 15:22:09 +02:00
Roman Mushchinski 4ab31d34c8
Make alternation of a user type validate the same way as creation of a user type does
patch by Roman Mushchinski; reviewed by Stefan Miklosovic and Andres de la Peña for CASSANDRA-18585
2023-08-23 15:07:12 +02:00
Stefan Miklosovic f8baabd95a
Merge branch 'cassandra-5.0' into trunk 2023-08-21 16:04:30 +02:00
Stefan Miklosovic f1f41e7579
Merge branch 'cassandra-4.1' into cassandra-5.0 2023-08-21 16:00:49 +02:00