Commit Graph

1318 Commits

Author SHA1 Message Date
Ekaterina Dimitrova 92182bcc23 build.xml first test commit 2021-01-17 14:29:28 -05:00
Mick Semb Wever 2ef0ac6ae9
Bump copyright to 2009-2021 2021-01-07 22:47:22 +01:00
Mick Semb Wever 401e933b73
Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, in the cassandra-all pom
patch by Mick Semb Wever; reviewed by Adrian Cole for CASSANDRA-16303
2021-01-02 10:14:41 +01:00
Mick Semb Wever 200615ded5
Increment version to 4.0-beta5 2020-12-30 12:47:53 +01:00
jacek-lewandowski 1102687d06 Fix the missing bb position in ByteBufferAccessor.getUnsignedShort
patch by Jacek Lewandowski; reviewed by Berenguer Blasi and Benjamin Lerer
for CASSANDRA-16249

The patch also update tests to show the failure and to check that the code
does not assume a zero position for the ByteBuffers.
2020-12-15 14:51:22 +01:00
Alex Petrov d41fe2aa8e Merge branch 'cassandra-3.11' into trunk 2020-12-14 14:34:35 +01:00
Alex Petrov 850157e7cf Merge branch 'cassandra-3.0' into cassandra-3.11 2020-12-14 14:23:00 +01:00
Alex Petrov 07c469ca13 Merge branch 'cassandra-2.2' into cassandra-3.0 2020-12-14 14:06:55 +01:00
Alex Petrov 033e099f9a Add Metrics to instance API
Patch by Alex Petrov; reviewed by Benedict Elliott Smith for CASSANDRA-16136
2020-12-14 14:05:12 +01:00
Brandon Williams acf8de28ce Mck's mvn fix 2020-12-04 15:34:49 -06:00
Aleksey Yeshchenko ecbb970aec Update build.xml for the newly pulled Netty version 2020-12-04 14:55:27 +00:00
Yuki Morishita d9e2ed00af Remove windows scripts and their references
patch by Yuki Morishita; reviewed by Berenguer Blasi and Andrés de la Peña for CASSANDRA-16171
2020-12-02 16:43:45 +00:00
Sam Tunnicliffe a7c4ba9eee Improve checksumming and compression in protocol V5
This reverts the changes made to the native protocol V5 wire format in
CASSANDRA-13304 and subsequent follow up JIRAs (CASSANDRA-15556 &
CASSANDRA-14716). The framing format has been re-implemented based on the
internode messaging format developed in CASSANDRA-15066.

OPTIONS and STARTUP messages are unframed (i.e. identical to the V4 format).
After sending its response to a STARTUP message, the server modifies the
pipeline and all further messages are sent (and should be expected by the
client to be received) in the format determined by the protocol version of
the STARTUP message.

Patch by Sam Tunnicliffe; reviewed by Alex Petrov and Caleb Rackliffe
for CASSANDRA-15299
2020-12-01 18:49:06 +00:00
Bereng 0bb1c51162
Update jctools from 1.2.1 to 3.1.0
patch by Berenguer Blasi; reviewed by Mick Semb Wever for CASSANDRA-16255
2020-11-20 08:51:54 +01:00
Alex Petrov 2a135cad6d Include test jars in dtest uber jar
patch by Alex Petrov; reviewed by David Capwell for CASSANDRA-16288
2020-11-19 14:04:38 -08:00
David Capwell e3cf77c730 ninja: CASSANDRA-16212 caused jvm-dtests to OOM constantly, so disable metaspace limits until the issue is resolved 2020-11-19 10:42:46 -08:00
Mick Semb Wever b73f034da1
Upgrade JNA to 5.6.0
Also remove remaining comments/doc referencing `-Dcassandra.boot_without_jna`

 patch by Adrain Cole, Mick Semb Wever; reviewed by Benjamin Lerer, Joey Lynch for CASSANDRA-16212

Co-authored-by: Adrian Cole <adrian.f.cole@gmail.com>
2020-11-16 09:36:45 +01:00
Mick Semb Wever f45b1edc91
Merge branch 'cassandra-3.11' into trunk 2020-11-04 13:03:42 +01:00
Mick Semb Wever 385434881f
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-11-04 12:48:42 +01:00
Mick Semb Wever b6ef9b22f2
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-11-04 12:42:20 +01:00
Mick Semb Wever 140048f5b7
Increment versions to 2.2.20, 3.0.24, 3.11.10, 4.0-beta4 2020-11-04 12:39:05 +01:00
Andrés de la Peña 095540d54a Merge branch 'cassandra-3.11' into trunk 2020-10-21 13:24:18 +01:00
Andrés de la Peña a2f59be943 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-21 13:19:50 +01:00
Andrés de la Peña d44dbd91c1 Merge branch 'cassandra-2.2' into cassandra-3.0
# Conflicts:
#	CHANGES.txt
2020-10-21 13:19:13 +01:00
Angelo Polo 72941b9ec1 Package tools/bin scripts as executable
patch by Angelo Polo; reviewed by Andres de la Peña for CASSANDRA-16151
2020-10-21 13:09:51 +01:00
Bereng f6281619ae Nodetool ring testing
Patch by Berenguer Blasi, reviewed by brandonwilliams for
CASSANDRA-16200
2020-10-19 10:38:21 -05:00
Andrés de la Peña 83b41b6b69 Merge branch 'cassandra-3.11' into trunk
# Conflicts:
#	CHANGES.txt
#	src/java/org/apache/cassandra/db/filter/ColumnFilter.java
#	test/unit/org/apache/cassandra/db/filter/ColumnFilterTest.java
2020-10-19 15:31:20 +01:00
Brandon Williams fde6600a52 Revert "Nodetool ring testing"
This reverts commit c54da9e243.
2020-10-17 15:46:18 -05:00
Bereng c54da9e243 Nodetool ring testing
Patch by Berenguer Blasi, reviewed by brandonwilliams for
CASSANDRA-16200
2020-10-16 09:30:23 -05:00
Jordan West 06bc316c89 Merge branch 'cassandra-3.11' into trunk 2020-10-14 12:06:10 -07:00
Jordan West a6c222499b Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-14 12:04:14 -07:00
Jordan West 7b3a15dd9f Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-14 12:02:14 -07:00
Jordan West 9a40e8079b upgrade to dtest-api 0.0.6
patch by Jordan West; reviewed by David Capwell for CASSANDRA-16148
2020-10-14 11:59:44 -07:00
David Capwell 2ae1ec5dd2 Merge branch 'cassandra-3.11' into trunk 2020-10-12 11:07:44 -07:00
David Capwell 34dde962fc Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-12 11:06:32 -07:00
David Capwell 42989cee28 Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-12 11:05:28 -07:00
David Capwell 521a6e2aa9 Fixed a NullPointerException when calling nodetool enablethrift
patch by David Capwell; reviewed by Ekaterina Dimitrova, Jordan West, Yifan Cai for CASSANDRA-16127
2020-10-12 11:04:37 -07:00
Rahul Nandi e37f766403 Upgrade to snakeyaml >= 1.26 version for CVE-2017-18640 fix
patch by Rahul Nandi; reviewed by Alex Petrov, David Capwell for CASSANDRA-16150
2020-10-09 13:02:38 -07:00
David Capwell 16da961f2b Merge branch 'cassandra-3.11' into trunk 2020-10-07 14:35:18 -07:00
David Capwell 6c8c791f19 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-07 14:34:04 -07:00
David Capwell 8d2556fd59 Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-07 14:33:02 -07:00
David Capwell 844d19d4e6 Add ant task to check license and fix all files missing a licence
patch by David Capwell; reviewed by Jordan West for CASSANDRA-16198
2020-10-07 14:32:12 -07:00
David Capwell 21a363becc Merge branch 'cassandra-3.11' into trunk 2020-10-05 19:06:58 -07:00
David Capwell b1efb8e418 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-10-05 19:05:44 -07:00
David Capwell 5a2b5a4e5e Merge branch 'cassandra-2.2' into cassandra-3.0 2020-10-05 19:04:15 -07:00
Marcus Eriksson 4d173e0a3f Don't adjust nodeCount when setting node id topology in in-jvm dtests.
Make sure we don't throw any uncaught exceptions during in-jvm dtests.

patch by Marcus Eriksson; reviewed by Alex Petrov, David Capwell for CASSANDRA-16109,CASSANDRA-16101
2020-10-05 19:03:19 -07:00
Mick Semb Wever 936a81bf34
Merge branch 'cassandra-3.11' into trunk 2020-09-30 21:31:00 +02:00
Mick Semb Wever f5d5e72f61
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-09-30 21:12:08 +02:00
Mick Semb Wever 9ee74c9dc0
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-09-30 21:08:26 +02:00
Mick Semb Wever aaef142f48
In Jenkins propagate FAILURE from stages to pipeline, ssh artefacts to nightlies, and move ant's junitreport generation to a separate target "generate-test-report"
patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-16128
2020-09-30 21:05:47 +02:00
Mick Semb Wever 3db64445f9
Cassandra website is building/including the wrong versioned nodetool docs
patch by Mick Semb Wever; reviewed by Anthony Grasso, Benjamin Lerer for CASSANDRA-16093
2020-09-24 14:18:54 +02:00
Alex Petrov 0dc5bd51f5 Changes required for Harry build
Patch by Alex Petrov; reviewed by Marcus Eriksson for CASSANDRA-16102
2020-09-18 23:39:10 +03:00
Mick Semb Wever fc87d3e0ab
Merge branch 'cassandra-3.11' into trunk 2020-08-31 21:02:14 +02:00
Mick Semb Wever ca37de06ef
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-08-31 21:00:57 +02:00
Mick Semb Wever 0eaed71d1d
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-08-31 20:59:29 +02:00
Mick Semb Wever 815de9982a
Merge branch 'cassandra-2.1' into cassandra-2.2 2020-08-31 20:57:58 +02:00
Mick Semb Wever 0271653f27
Increment versions after releases 2.1.22, 2.2.18, 3.0.22, 3.11.8, 4.0-beta2 2020-08-31 20:55:39 +02:00
Mick Semb Wever d49360bf27
Increment version to 2.1.22 2020-08-28 12:46:43 +02:00
Mick Semb Wever 382bcad07d
Backport CASSANDRA-14970 to 2.1 - New releases must supply SHA-256 and/or SHA-512 checksums
patch by Mick Semb Wever; reviewed by Benjamin Lerer for CASSANDRA-16081
2020-08-28 12:18:44 +02:00
David Capwell 0697489f74 Add test which validates that Message serializedSize(version) == serialize(out, version).length
patch by David Capwell; reviewed by Caleb Rackliffe, Jon Meredith for CASSANDRA-16064
2020-08-26 15:25:34 -07:00
David Capwell 528e3ad00b jvm-dtests crash on java 11
patch by David Capwell; reviewed by Alex Petrov, Jon Meredith for CASSANDRA-15981
2020-08-05 21:18:33 -07:00
Caleb Rackliffe 292650d968 Merge branch 'cassandra-3.11' into trunk 2020-07-30 14:10:48 +01:00
Caleb Rackliffe 2ef1f1c150 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-07-30 13:27:53 +01:00
Caleb Rackliffe e5c3d08a14 Operational improvements and hardening for replica filtering protection
patch by Caleb Rackliffe; reviewed by Andrés de la Peña for CASSANDRA-15907
2020-07-30 12:53:52 +01:00
Mick Semb Wever d6a8afe64d
Increment to version 3.0.22 2020-07-29 16:37:23 +02:00
David Capwell 8c61214537 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-07-24 18:50:47 -07:00
David Capwell ebf9c74c4e Merge branch 'cassandra-2.2' into cassandra-3.0 2020-07-24 18:48:32 -07:00
David Capwell 25fd7bd84f Add support in jvm dtest to test thrift
patch by David Capwell; reviewed by Alex Petrov,Jon Meredith for CASSANDRA-15967
2020-07-24 18:47:04 -07:00
Mick Semb Wever 3f92ff7854
Increment version to 3.11.8 2020-07-25 00:32:42 +02:00
Mick Semb Wever 53e3309e4d
Increment version to 2.2.18 2020-07-24 23:51:54 +02:00
Mick Semb Wever 39c8ec2cf6
Increment version to 4.0-beta2 2020-07-24 00:07:47 +02:00
Mick Semb Wever 7ba6403f6a
Switch version 4.0-alpha5 to 4.0-beta1 2020-07-14 23:39:00 +02:00
Mick Semb Wever 9481e4e9fa
Fix javadoc on jdk11
patch by Mick Semb Wever; reviewed by shylaja kokoori, Robert Stupp for CASSANDRA-15809
2020-07-14 10:43:03 +02:00
Marcus Eriksson b6ce3b8091 Merge branch 'cassandra-3.11' into trunk 2020-07-10 10:37:40 +02:00
Marcus Eriksson ac289270f2 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-07-10 10:33:44 +02:00
Marcus Eriksson fad5a09c9f Merge branch 'cassandra-2.2' into cassandra-3.0 2020-07-10 10:30:46 +02:00
Marcus Eriksson f79d105928 Add bytebuddy support for in-jvm dtest
Patch by marcuse; reviewed by David Capwell for CASSANDRA-15851
2020-07-10 10:30:12 +02:00
bryn 02a80ef94f Update driver version to prevent issues with extra events being received when a node is decommissioned.
Patch by Bryn Cooke, reviewed by brandonwilliams for CASSANDRA-15677
2020-06-22 09:18:22 -05:00
Stefan Miklosovic d31ea25f42 Update Netty dependencies to latest
patch by Stefan Miklosovic; reviewed by Aleksey Yeschenko for
CASSANDRA-15868
2020-06-18 14:43:41 +01:00
Stefan Miklosovic 576cb2b8a4 update Jackson to 2.9.10
Patch by Stefan Miklosovic, reviewed by brandonwilliams for
CASSANDRA-15867
2020-06-17 11:21:35 -05:00
Stefan Miklosovic 259c63f18e update version of Jackson to 2.9.10
Patch by Stefan Milosovic, reviewed by brandonwilliams for
CASSANDRA-15867
2020-06-11 15:12:01 -05:00
Alan Boudreault 6317fefec8 Fix missing topology events when running multiple nodes on the same network interface
Patch by Alan Boudrealt and Bryn Cook, reviewed by brandonwilliams for
CASSANDRA-15677
2020-06-10 10:16:07 -05:00
Brandon Williams 66cd0324c4 Revert "Make sure topology events are sent to clients when using a single network interface"
This reverts commit 595a4528dc.
2020-06-09 15:54:02 -05:00
Alan Boudreault 595a4528dc Make sure topology events are sent to clients when using a single network interface
Patch by Alan Boudrealt and Bryn Cooke; reviewed by brandonwilliams for CASSANDRA-15677
2020-06-09 15:37:13 -05:00
Mick Semb Wever 6978307b79
Merge branch 'cassandra-3.11' into trunk 2020-06-09 09:48:14 +02:00
Mick Semb Wever e49853914b
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-06-09 09:45:52 +02:00
Mick Semb Wever c092c4610e
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-06-09 09:44:24 +02:00
Mick Semb Wever 334024751c
Remove generated files from apache-cassandra-*-src.tar.gz artifacts
patch by Mick Semb Wever; reviewed by Robert Stupp for CASSANDRA-15849
2020-06-08 22:31:41 +02:00
Alex Petrov 7bbc97e583 Merge branch 'cassandra-3.11' into trunk 2020-06-05 19:34:13 +02:00
Alex Petrov 04b0049831 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-06-05 19:26:56 +02:00
Alex Petrov 880b07c2e6 Merge branch 'cassandra-2.2' into cassandra-3.0 2020-06-05 19:25:27 +02:00
David Capwell 4fef917f98 In-jvm dtest builder should be provided to the factory and expose state
Patch by David Capwell; reviewed by Alex Petrov for CASSANDRA-15733.
2020-06-05 19:15:52 +02:00
Mick Semb Wever 183812b6f9
Merge branch 'cassandra-3.11' into trunk 2020-05-06 12:58:49 +02:00
Mick Semb Wever 996c0ada09
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-05-06 12:56:02 +02:00
Mick Semb Wever 196e54436f
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-05-06 12:55:00 +02:00
mpfau c6a9f5513e
Remove duplicates from tarball
patch by Matthias Pfau; reviewed by Eduard Tudenhöfner, Mick Semb Wever for CASSANDRA-15768
2020-05-06 12:39:26 +02:00
Mick Semb Wever 03c9bd3163
Merge branch 'cassandra-3.11' into trunk 2020-04-30 19:37:49 +02:00
Mick Semb Wever 4801fef22a
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-04-30 19:35:56 +02:00
Mick Semb Wever 0fd9b5bd6f
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-04-30 19:34:14 +02:00
Mick Semb Wever b44a2140f8
Make all test targets declare the temp directory (java.io.tmpdir) as defined by tmp.dir
patch by Mick Semb Wever; reviewed by Berenguer Blasi, Ekaterina Dimitrova for CASSANDRA-15777
2020-04-30 18:32:41 +02:00