Commit Graph

28164 Commits

Author SHA1 Message Date
Brandon Williams f9364e4f44 Suppress CVE-2022-45688
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18389
2023-04-03 05:57:00 -05:00
Caleb Rackliffe 03806f95e4 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Avoid loading the preferred IP for BulkLoader streaming
2023-03-31 11:58:59 -05:00
Caleb Rackliffe 853ae8c840 Avoid loading the preferred IP for BulkLoader streaming
patch by Caleb Rackliffe; reviewed by Jon Meredith for CASSANDRA-18370

Co-authored-by: Caleb Rackliffe <calebrackliffe@gmail.com>
Co-authored-by: Jon Meredith <jonmeredith@apache.org>
2023-03-31 11:57:29 -05:00
Jacek Lewandowski 14936d0bd3 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Save host id to system.local and flush immediately after startup
2023-03-31 17:34:19 +02:00
Jacek Lewandowski 4b9c18235a Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Save host id to system.local and flush immediately after startup
2023-03-31 17:30:20 +02:00
Jacek Lewandowski ee586b53c2 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Save host id to system.local and flush immediately after startup
  Remove asf.yaml from non-trunk branches
  Notify the corresponding JIRA issue as soon as the PR is raised
2023-03-31 17:30:19 +02:00
Jacek Lewandowski f96659c530 Save host id to system.local and flush immediately after startup
patch by Adriano Bonacin and Jacek Lewandowski; reviewed by Stefan Miklosovic and Sam Tunnicliffe for CASSANDRA-18153
2023-03-31 17:30:18 +02:00
Brandon Williams 20bf2273a0 Remove asf.yaml from non-trunk branches 2023-03-30 08:40:15 -05:00
Maxim Muzafarov 24f5b64f26 Notify the corresponding JIRA issue as soon as the PR is raised
Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18372
2023-03-30 08:40:15 -05:00
Brandon Williams 780f8b94ff Merge branch 'cassandra-4.0' into cassandra-4.1 2023-03-29 06:32:20 -05:00
Brandon Williams 5f61645778 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-29 06:32:13 -05:00
Brandon Williams c4535a2e2a Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-29 06:32:09 -05:00
Brandon Williams 2f8d11335e Remove asf.yaml from non-trunk branches 2023-03-29 06:32:05 -05:00
Brandon Williams 5fa2f87741 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-03-29 06:26:40 -05:00
Brandon Williams 5b877b9d2b Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-29 06:26:15 -05:00
Brandon Williams 11b84d2ef2 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-29 06:25:59 -05:00
Maxim Muzafarov f352f2b637 Notify the corresponding JIRA issue as soon as the PR is raised
Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18372
2023-03-29 06:24:34 -05:00
Stefan Miklosovic 6f401a8725
Return snapshots with dots in their name in nodetool listsnapshots
patch by Stefan Miklosovic; reviewed by Paulo Motta for CASSANDRA-18371
2023-03-28 19:00:40 +02:00
Stefan Miklosovic 4ac89e6451
Fix NPE when loading snapshots and data directory is one directory from root
patch by Stefan Miklosovic; reviewed by Paulo Motta for CASSANDRA-18359
2023-03-26 23:29:28 +02:00
Paulo Motta 7c2f97cd29 Do not submit hints when hinted_handoff_enabled=false
- Remove dead WriteCallbackInfo code

Patch by Paulo Motta, Aleksey Yeschenko; Reviewed by Stefan Miklosovic, Claude Warren for CASSANDRA-18304

Co-authored-by: Aleksey Yeschenko <aleksey@apache.org>
2023-03-24 12:17:17 -04:00
Brandon Williams 70b95d8098 Restore COPY ... TO STDOUT behavior in cqlsh
Patch by brandonwilliams; reviewed by adelapena for CASSANDRA-18353
2023-03-22 13:28:47 -05:00
Brandon Williams a6f8dd10cd Remove six and Py2SaferScanner merge cruft
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-18354
2023-03-22 10:18:29 -05:00
Brandon Williams 3021c33cab Increment version to 4.1.2 2023-03-21 07:00:29 -05:00
Jacek Lewandowski fb9699c231 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix RepairJob unnecessarily reporting cancellation error
2023-03-21 10:12:04 +01:00
Jacek Lewandowski 2974810607 Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Fix RepairJob unnecessarily reporting cancellation error
2023-03-21 10:09:31 +01:00
Jacek Lewandowski 955cf156c8 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Fix RepairJob unnecessarily reporting cancellation error
2023-03-21 10:08:12 +01:00
Jacek Lewandowski f6a04ca81f Fix RepairJob unnecessarily reporting cancellation error
patch by Jacek Lewandowski; reviewed by Brandon Williams for CASSANDRA-17701
2023-03-21 10:04:24 +01:00
David Capwell d5b1483703 Incompatible file system thrown while running Simulator
patch by David Capwell; reviewed by Brandon Williams, Caleb Rackliffe for CASSANDRA-18320
2023-03-15 16:19:04 -07:00
Stefan Miklosovic 8d91b469af
Prepare debian changelog for 4.1.1 2023-03-15 09:09:07 +01:00
Jacek Lewandowski deb8abd2fd Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix the ordering of sstables when running sstableupgrade tool
2023-03-14 15:18:37 +01:00
Jacek Lewandowski 5104008db9 Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
  Fix the ordering of sstables when running sstableupgrade tool
2023-03-14 15:16:22 +01:00
Jacek Lewandowski 58d06d34ab Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Fix the ordering of sstables when running sstableupgrade tool
2023-03-14 15:14:31 +01:00
Claude Warren 8df69c8016 Fix the ordering of sstables when running sstableupgrade tool
patch by Claude Warren; reviewed by Jacek Lewandowski and Stefan Miklosovic for CASSANDRA-18143
2023-03-14 14:52:53 +01:00
Jacek Lewandowski 8ba3888fcf Merge branch 'cassandra-4.0' into cassandra-4.1 2023-03-13 09:57:11 +01:00
Jaroslaw Grabowski 3cfb222122 Fix BufferPool.memoryInUse counter
The counter was incorrectly decremented by the size of the unused portion of the provided buffer.
It is now decremented by the number of bytes actually returned to the pool (that may be different than "size"). The number is calculated as a difference between original and resulting buffer capacity.

patch by Jaroslaw Grabowski <jtgrabowski>, reviewed by Jacek Lewandowski <jacek-lewandowski> for CASSANDRA-18311
2023-03-13 09:51:33 +01:00
Stefan Miklosovic b7eaa2d209
Deprecate org.apache.cassandra.hadoop code
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-16984
2023-03-12 21:34:29 +01:00
Andrés de la Peña bfc7621c8c Merge branch 'cassandra-4.0' into cassandra-4.1 2023-03-10 11:52:40 +00:00
Andrés de la Peña 2aedb58123 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-10 11:51:25 +00:00
Andrés de la Peña 4b3cb0a772 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-10 11:50:04 +00:00
Andrés de la Peña 02048cffea Remove -l / -m / -h designation and have two options: free or paid tier circle config
patch by Andrés de la Peña; reviewed by Ekaterina Dimitrova and Josh McKenzie for CASSANDRA-18012
2023-03-10 11:48:31 +00:00
Tibor Répási af82b941a8
Restore 4.1's doc update for virtual table system_views.clients
patch by Tibor Répási; reviewed by Ekaterina Dimitrova, Michael Semb Wever for CASSANDRA-18303, CASSANDRA-17344
2023-03-09 20:55:24 +01:00
Brandon Williams 0ea1d384d4 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-03-09 10:04:31 -06:00
Brandon Williams a874e02eec Merge branch 'cassandra-3.11' into cassandra-4.0 2023-03-09 10:03:14 -06:00
Brandon Williams 326b5aceb1 Merge branch 'cassandra-3.0' into cassandra-3.11 2023-03-09 10:02:21 -06:00
Brandon Williams be574fc34b Fix default file system error handler for disk_failure_policy die
Patch by Runtian Liu; reviewed by brandonwilliams and smiklosovic for
CASSANDRA-18294
2023-03-09 10:00:49 -06:00
Jacek Lewandowski 5f7175d59d Small fixes around Schema management
- Denormalize distributedAndLocalKeyspaces to remove perf degradation
- Set updated schema version once applied

patch by Jacek Lewandowski, reviewed by Stefan Miklosovic for CASSANDRA-18291
2023-03-09 08:12:10 +01:00
Jon Meredith 6adcff8f30 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-03-07 10:36:16 -07:00
Benedict Elliott Smith 40f9ca60f1 Improve memtable allocator accounting when updating AtomicBTreePartition
patch by Benedict Elliott Smith; reviewed by Benjamin Lerer, Jon Meredith for CASSANDRA-18125
2023-03-07 10:28:32 -07:00
Brandon Williams 426829cf57 Merge branch 'cassandra-4.0' into cassandra-4.1 2023-02-24 12:32:31 -06:00
Brandon Williams ccede05bf5 Merge branch 'cassandra-3.11' into cassandra-4.0 2023-02-24 12:32:18 -06:00