Commit Graph

1502 Commits

Author SHA1 Message Date
Ekaterina Dimitrova 29e4612e88 Fix warning about multiple versions of ant detected when running ant test
patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Mick Semb Wever for CASSANDRA-16571
2021-04-08 17:42:48 -04:00
Mick Semb Wever c65500e8a1
Update IDE, Eclipse and NetBeans, classpaths for tests
patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova, Benjamin Lerer for CASSANDRA-16560
2021-04-08 11:10:19 +02:00
Marcus Eriksson 6a45728b08 Add JStackJUnitTask to avoid downloading the jar
Patch by marcuse; reviewed by Brandon Williams, David Capwell, Michael Semb Wever for CASSANDRA-16570
2021-04-08 09:47:50 +02:00
Mick Semb Wever 17d379ca1b
Offline build mode
When all dependencies are already in the local `~/.m2/repository/` we should not be needing an internet connection. ("Offline" mode should be automatic)

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16559
2021-04-06 19:09:08 +02:00
Mick Semb Wever cf39d03127
Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16391
2021-04-02 10:17:08 +02:00
Mick Semb Wever 8f5b7fec71
Change version 4.0-beta5 to 4.0-rc1 2021-03-26 20:45:34 +01:00
Sam Tunnicliffe 1371883db3 Update bundled driver dependencies
This commit updates that bundled java and python drivers
to their latest released versions, 3.11.0 and 3.25.0
respectively.

Patch by Sam Tunnicliffe and Adam Holmberg; reviewed by
Brandon Williams for CASSANDRA-13951

Co-authored-by: Adam Holmberg <adam.holmberg@datastax.com>
2021-03-22 17:13:53 +00:00
Sam Tunnicliffe dd6c261119 Add io.netty.tryReflectionSetAccessible=true to j11 server options in order to enable netty to use Unsafe direct byte buffer construction
Patch by Sam Tunnicliffe; reviewed by Brandon Williams, Ekaterina Dimitrova and Berenguer Blasi for CASSANDRA-16493
2021-03-19 17:36:13 -04:00
Mick Semb Wever f8b79ce932
Merge branch 'cassandra-3.11' into trunk 2021-03-19 18:11:14 +01:00
Mick Semb Wever e9209527f2
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-19 18:02:01 +01:00
Mick Semb Wever 1ee18ac22d
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-03-19 17:57:34 +01:00
Mick Semb Wever 730e89e229
Remove ant targets list-jvm-dtests and ant list-jvm-upgrade-dtests
patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16519
2021-03-19 17:36:19 +01:00
jacek-lewandowski 2ff456953f Make driver timeouts configurable and increase them for CqlTester
Patch by Jacek Lewandowski; reviewed by brandonwilliams for
CASSANDRA-16514
2021-03-14 12:49:25 -05:00
jacek-lewandowski 11d069a766
Fix probable collision when running unit tests in parallel, and use runners on testclasslist* targets
patch by Jacek Lewandowski; reviewed by Mick Semb Wever, Brandon Williams for CASSANDRA-16511
2021-03-12 15:48:33 +01:00
Ekaterina Dimitrova c7432e98a3 Merge branch 'cassandra-3.11' into trunk 2021-03-10 20:55:06 -05:00
Ekaterina Dimitrova b654000936 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-10 20:53:06 -05:00
Sylvain Lebresne efde6a76f9 Refuse DROP COMPACT STORAGE if some 2.x sstables are in use
patch by Sylvain Lebresne; review changes and tests by Ekaterina Dimitrova; reviewed by Benjamin Lerer and Brandon Williams for CASSANDRA-15897
2021-03-10 20:33:54 -05:00
Brandon Williams 995ce0ee21 Merge branch 'cassandra-3.11' into trunk 2021-03-04 08:14:57 -06:00
Brandon Williams a66246f9e8 Upgrade jackson-databind to 2.9.10.8
Patch by brandonwilliams, reviewed by adelapena for CASSANDRA-16462
2021-03-04 08:14:16 -06:00
Bereng 2d9d17894d Fix cassandra-stress JMX connection
Patch by Berenguer Blasi; reviewed by brandonwilliams for CASSANDRA-16473
2021-03-03 09:34:41 -06:00
Andrés de la Peña 0541c51996 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-01 12:33:02 +00:00
Sam Tunnicliffe c9d6c725dd Promote protocol v5 from beta
Patch by Sam Tunnicliffe; reviewed by Alex Petrov and Eduard Tudenhoefner
for CASSANDRA-14973
2021-02-23 16:46:39 +00:00
Mick Semb Wever 637b242840
Merge branch 'cassandra-3.11' into trunk 2021-02-08 11:28:47 +01:00
Mick Semb Wever b0a5a7cfc7
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-02-08 11:28:00 +01:00
Mick Semb Wever 4333b5c7d5
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-02-08 11:05:14 +01:00
Mick Semb Wever d19f352437
Generate JMH json report with `ant microbench`
patch by Mick Semb Wever; reviewed by Tomek Łasica for CASSANDRA-16371
2021-02-08 10:55:58 +01:00
Benjamin Lerer f69b11eee9 Improve system tables handling in case of disk failures
patch by Benjamin Lerer; reviewed by Andrés de la Peña and  Marcus
Eriksson for CASSANDRA-14793
2021-02-04 15:04:22 +01:00
Alex Petrov ed51d02f7c Increment version to 3.11.11 2021-02-01 16:02:21 +01:00
Alex Petrov f35ab19dbe Increment version to 3.0.25 2021-02-01 15:59:15 +01:00
Ekaterina Dimitrova 0a9e129e10 Upgrade Jacoco to 0.8.6 (for Java 11 support)
Patch by Jacek Lewandowski; reviewed by Michael Semb Wever for CASSANDRA-16365
2021-01-28 17:36:59 -05:00
zhaorenhai 7f1659cd1d
Upgrade netty and chronicle-queue dependencies to get Auditing and native library loading working on arm64 architectures
CASSANDRA-16384 test case AuditLoggerTest fail on aarch64 platform
 CASSANDRA-16392 Unable to load the library netty_tcnative_linux_aarch_64

 patch by Zhao Renhai (赵 仁海); reviewed by Mick Semb Wever for CASSANDRA-16384,CASSANDRA-16392
2021-01-22 10:02:20 +01:00
Ekaterina Dimitrova 9fc0b75a65 Merge branch 'cassandra-3.11' into trunk 2021-01-19 10:30:12 -05:00
Ekaterina Dimitrova c1f60ae48a Merge branch 'cassandra-3.0' into cassandra-3.11 2021-01-19 10:24:51 -05:00
Ekaterina Dimitrova f42a4ebb8d Merge branch 'cassandra-2.2' into cassandra-3.0 2021-01-19 09:33:34 -05:00
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
Mick Semb Wever b6f1fe6f9d
Increment version to 4.0-alpha5 2020-04-24 14:28:32 +02:00
Jon Meredith c4db3f89a9 Generate compiler options file to support Java11 in IDEA.
The change to JMX in CASSANDRA-15653 prevents the IDEA project from
compiling under JDK11.  This change adds the required compiler flag
when the project is upgraded from Java1.8 to Java11.

Patch by Jon Meredith; Reviewed by Dinesh Joshi for CASSANDRA-15738
2020-04-17 20:24:33 -07:00
Mick Semb Wever 52a55d821a
Exclude JNA from Chronicle's dependencies to avoid bringing wrong versions into consumers of Cassandra as a library
patch by Doug Rohrer; reviewed Ryan Svihla, Jon Meredith, Mick Semb Wever for CASSANDRA-15647
2020-04-14 19:37:34 +02:00
Kevin Gallardo 6d343c59f2 Add AssertJ test dependency.
Patch by Kevin Gallardo, reviewed by David Capwell and brandon.williams
for CASSANDRA-15631
2020-04-02 14:20:11 -05:00
Alex Petrov 0934730c2b Merge branch 'cassandra-3.11' into trunk 2020-03-27 19:13:17 +01:00
Alex Petrov a7820d1039 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-03-27 19:08:31 +01:00
Alex Petrov c2cfebf44f Merge branch 'cassandra-2.2' into cassandra-3.0 2020-03-27 19:04:38 +01:00
Alex Petrov 1f72cc6197 Extract in-jvm-dtest API
Patch by Alex Petrov for CASSANDRA-15539; reviewed by David Capwell and Dinesh Joshi.
2020-03-27 18:34:53 +01:00
Sam Tunnicliffe b9c7a90e8a Ninja: fix jdk11 build 2020-03-25 19:31:41 +00:00
Mick Semb Wever 439e0b055d
Merge branch 'cassandra-3.11' into trunk 2020-03-25 09:52:54 +01:00
Mick Semb Wever fa403bb721
Jenkins tests to use testclasslist where possible (like CircleCI)
patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-15651
2020-03-25 09:16:42 +01:00
David Capwell cd9fd9e83f Refactor repair coordinator to centralize stage change logic and improved the public facing errors
Patch by David Capwell; reviewed by Blake Eggleston, Zhao Yang, Dinesh Joshi, and Alex Petrov for CASSANDRA-15564
2020-03-12 17:37:39 +01:00
Blake Eggleston c9e40277f0 Add compaction allocation measurement test
Patch by Blake Eggleston, reviewed by Benedict Elliott Smith and David Capwell for CASSANDRA-15388
2020-03-11 12:50:50 -07:00
Michael Shuler 8f958195cd Bump version to 3.11.7 2020-02-14 18:49:22 -06:00
Michael Shuler 899a4fd663 Bump version to 3.0.21 2020-02-14 18:44:09 -06:00
Michael Shuler 5f0cf80c0a Bump version to 2.2.17 2020-02-14 18:41:47 -06:00
Ekaterina Dimitrova 3f2a248da1 Update hppc library to version 0.8.1
Patch by Ekaterina Dimitrova, reviewed by brandonwilliams for CASSANDRA-12995
2020-02-12 11:21:05 -06:00
David Capwell f80a2ce10c Prevent the JVM from crashing due to corrupt LZ4 streams
Patch by David Capwell; reviewed by Jordan West and brandonwilliams for
CASSANDRA-15556
2020-02-11 11:00:24 -06:00
Mick Semb Wever a064bbd264
Increment version to 4.0-alpha4 2020-02-07 21:18:16 +01:00
Brandon Williams 0f102c8670 disable shrinks in quicktheories
Patch by brandonwilliams, reviewed by Jordan West and David Capwell for
CASSANDRA-15554
2020-02-06 16:45:22 -06:00
Michael Shuler b26927d863 Switch http to https URLs in build.xml
Patch by Michael Shuler; Reviewed by Joshua McKenzie for CASSANDRA-15137
(Backport to 2.1 to fix build.)
2020-02-03 12:29:47 -06:00
Mick Semb Wever 729146a074
Merge branch 'cassandra-3.11' into trunk 2020-01-29 23:34:34 +01:00
Mick Semb Wever 37ce4618b5
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-29 23:33:30 +01:00
Mick Semb Wever 7816301ef2
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-29 23:19:17 +01:00
Mick Semb Wever 531dc2a46a
ninja-fixes: `ant publish` needs to have built the artifacts, and update the cassandra_logdir_fix debian patch after CASSANDRA-14306 2020-01-29 23:02:59 +01:00
Mick Semb Wever f1e94db34c
Merge branch 'cassandra-3.11' into trunk 2020-01-28 07:58:11 +01:00
Mick Semb Wever d71625a42e
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-28 07:56:59 +01:00
Mick Semb Wever 5508fecf54
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-28 07:53:24 +01:00
Mick Semb Wever 06a36045fe
Source and build artifacts are published with sha512 checksums
patch by Mick Semb Wever; reviewed by Michael Shuler for CASSANDRA-14970
2020-01-28 07:51:12 +01:00
Blake Eggleston 1f7e3c2835 Fix in-jvm dtest java 11 compatibility
Patch by Blake Eggleston; Reviewed by Alex Petrov and David Capwell for CASSANDRA-15463
2020-01-27 14:13:50 -08:00
Boris Tsirkin 2dbae87c78 Remove joda time dependency.
Patch by Boris Tsikin, reviewed by brandonwilliams for CASSANDRA-15257
2020-01-23 11:19:36 -06:00
Mick Semb Wever 8f7f6e903b
Merge branch 'cassandra-3.11' into trunk 2020-01-21 19:12:38 +01:00
Mick Semb Wever 6a8e211fba
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-21 19:10:59 +01:00
Mick Semb Wever 14aa561c32
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-21 19:08:52 +01:00
Mick Semb Wever d69f7696e4
Create Jenkins pipeline definition, and split out Jenkins test-all builds to individual builds for each of the test targets
patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-15496
2020-01-21 18:59:16 +01:00
yifan-c 1fbd3297a9 Release session from cache when closing QueryReplayer
Patch by Yifan Cai; reviewed by marcuse for CASSANDRA-15514
2020-01-20 15:00:25 +01:00
Marcus Eriksson 8da277e573 Merge branch 'cassandra-3.11' into trunk 2020-01-16 11:06:56 +01:00
Marcus Eriksson 3bb388b364 Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-16 11:02:31 +01:00
Marcus Eriksson 5f57212267 Run in-jvm upgrade dtests in circle ci
Patch by marcuse; reviewed by Alex Petrov for CASSANDRA-15506
2020-01-16 10:56:18 +01:00
Ekaterina Dimitrova 82dc72088f Integrate SJK into nodetool
Patch by Ekaterina Dimotrova, reviewed by brandonwilliams for
CASSANDRA-12197
2020-01-10 11:41:12 -06:00
Mick Semb Wever e3af8fff74
Bump copyright to 2009-2020 2020-01-01 14:16:08 +01:00
Michael Shuler 6d93f046c2 Increment version to 4.0-alpha3 2019-10-29 16:17:35 -05:00
Michael Shuler fb50d823b6 Increment version to 3.11.6 2019-10-29 16:15:49 -05:00
Michael Shuler ae366ba615 Increment version to 3.0.20 2019-10-29 16:11:57 -05:00
Michael Shuler a593d7b358 Increment version to 2.2.16 2019-10-29 16:09:30 -05:00
Dinesh A. Joshi 5d401f3a39 Merge branch 'cassandra-3.11' into trunk 2019-10-08 14:15:06 -07:00
Dinesh A. Joshi 4675b3fd33 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-10-08 14:10:40 -07:00
Sumanth Pasupuleti 38b49904dd
Upgrading Guava to 27, and to java-driver 3.6.0 (from 3.4.0-SNAPSHOT), plus refactoring to remove nativePort argument for NativeSSTableLoaderClient constructor
Patch by Sumanth Pasupuleti; reviewed by Michael Semb Wever for CASSANDRA-14655
2019-10-07 21:19:42 +02:00
Marvin Froeder bc5fc8bc2d
Move chronicle-core version from SNAPSHOT to STABLE, and include carrotsearch on pom.xml dependency list
Closes #358

 patch by Marvin Froeder; reviewed by Mick Semb Wever for CASSANDRA-15321
2019-09-22 19:22:20 +02:00
Mick Semb Wever 21ebba85ac
Update version to 4.0-alpha2 2019-09-10 07:17:51 +02:00
Michael Shuler 145f6d6dc4 Set base.version and changelog to 4.0-alpha1 2019-09-05 12:06:43 -07:00
Blake Eggleston 96ac94dabc ninja: fix ant artifacts on java 8 2019-08-31 11:27:19 -07:00
Jon Meredith 7dc5b700b7 Merge branch 'cassandra-3.11' into trunk 2019-08-20 16:10:59 +01:00
Jon Meredith 3df63ed054 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-08-15 14:21:23 -06:00
Jon Meredith 51c0f6b2f0 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-08-15 14:14:48 -06:00
Jon Meredith 8dcaa12baa Allow instance class loaders to be garbage collected for inJVM dtest
Backport support optional network/gossip test features,
instance generations and subnet support from trunk.

Backport MessageFilter and cluster builder API changes to match
trunk (except for the change in namespace for Verbs).

Add a test for repeatedly creating/tearing down in-JVM dtest
clusters to help find resource leaks.

Change IsolatedExecutor to clean up on an executor with zero
core threads so that it exits sooner enabling GC on the
InstanceClassLoader.  Moved classloader close after shutdown to prevent
improve logging when the isolated executor is shutdown.

Update the logback config for dtests to make it obvious
which log threads are for instances vs the main logger.

Disable native library loading until it can be reinstated
(tracked in CASSANDRA-15170).

Shutdown various executors and threads that were
preventing the instance classloader from being unloaded.

Add test-jvm-dtest-some ant target

Patch by Jon Meredith; Reviewed by Alex Petrov and
Benedict Elliott Smith for CASSANDRA-15170
2019-08-15 10:12:06 -06:00
Aleksey Yeshchenko a339aa9e98 Update Netty dependencies to latest, clean up SocketFactory
patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-15195
2019-07-02 19:39:34 +01:00
Benedict Elliott Smith 310a48efcf Rewrite the internode messaging subsystem
patch by Aleksey Yeschenko and Benedict Elliott Smith; reviewed by Alex
Petrov, Aleksey Yeschenko, and Benedict Elliott Smith for CASSANDRA-15066

Co-authored-by: Aleksey Yeschenko <aleksey@apache.org>
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2019-06-12 16:26:54 +01:00
Ted Petersson a9a4f171be Fix JDK7 compatibility broken in cassandra-2.2
Patch by Ted Petersson; Reviewed by Michael Shuler for CASSANDRA-15050
2019-06-06 11:27:38 -05:00
Michael Shuler 2d3157cb8c Merge branch 'cassandra-3.0' into cassandra-3.11 2019-05-22 15:15:46 -04:00
Michael Shuler fa6b40f460 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-05-22 15:09:25 -04:00
Michael Shuler 63ff65a8dd Switch http to https URLs in build.xml
Patch by Michael Shuler; Reviewed by Joshua McKenzie for CASSANDRA-15137
2019-05-22 15:03:43 -04:00
Michael Shuler ca0ea40eea Switch http to https URLs in build.xml
Patch by Michael Shuler; Reviewed by Joshua McKenzie for CASSANDRA-15137
2019-05-21 17:54:11 -04:00
Blake Eggleston aa762c6d52 Support building Cassandra with JDK 11
Patch by Blake Eggleston; Reviewed by Dinesh Joshi and Sam Tunnicliffe for CASSANDRA-15108
2019-05-10 13:46:27 -07:00
Blake Eggleston 587961a19c Merge branch 'cassandra-3.11' into trunk 2019-04-25 10:23:40 -07:00
Blake Eggleston 01d6548e0d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-04-25 10:21:55 -07:00
Blake Eggleston c3ce32e239 Fix assorted gossip races and add related runtime checks
Patch by Blake Eggleston; Reviewed by Ariel Weisberg for CASSANDRA-15059
2019-04-25 10:20:46 -07:00
Mick Semb Wever ed2d32612a
Apache NetBeans "Run", "Debug", "Profile" IDE actions
patch by Mick Semb Wever ; reviewed by Dinesh Joshi for CASSANDRA-15083
2019-04-18 12:07:15 +10:00
Blake Eggleston 9063ceabc9 Fix AbstractBTreePartition locking in java 11
Patch by Blake Eggleston; Reviewed by Benedict Elliot Smith for CASSANDRA-14607
2019-03-25 14:24:16 -07:00
Marcus Eriksson a85196246c Merge branch 'cassandra-3.11' into trunk 2019-03-15 10:02:00 +00:00
Marcus Eriksson 0c2d99244d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-03-15 09:56:16 +00:00
Marcus Eriksson 7bda2a0619 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-03-15 09:52:43 +00:00
Stefan Podkowinski 7333c2b04d Refactor Circle CI configuration
Enable high resource settings by copying .circleci/config.yml.HIGHRES
to .circleci/config.yml. For more details, see .circleci/readme.md

Patch by Stefan Podkowinski; reviewed by marcuse for CASSANDRA-14806
2019-03-15 09:47:27 +00:00
Mick Semb Wever 9ecec33c41
Merge branch 'cassandra-3.11' into trunk 2019-03-08 19:54:37 +11:00
Mick Semb Wever 84fc68ce3f
Fix copyright years in generated apidocs and in the NOTICE file
Patch by Bernhard M. Wiedemann; reviewed by Mick Semb Wever for CASSANDRA-15039
2019-03-08 19:51:10 +11:00
Alex Petrov 5c4c75cac7 Merge branch 'cassandra-3.11' into trunk 2019-02-25 14:20:03 +01:00
Alex Petrov 7b462ec467 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-25 14:16:19 +01:00
Alex Petrov b27cc37abd Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-25 14:14:19 +01:00
Alex Petrov a7d8ba7b10 Fix memory-retention problem arising from thread locals from schema change in in-jvm tests
patch by Alex Petrov; reviewed by Joseph Lynch for CASSANDRA-15014
2019-02-25 14:00:16 +01:00
Dinesh Joshi dccf53061a Add Zstd compressor
Patch by Dinesh Joshi; Reviewed by Blake Eggleston for CASSANDRA-14482
2019-02-22 15:06:06 -08:00
Michael Shuler 123113f7b8 Update version to 3.11.5 2019-02-11 21:16:03 -06:00
Michael Shuler 229f8b3a44 Update version to 3.0.19 2019-02-11 21:09:23 -06:00
Michael Shuler ce6bcaa5b8 Update version to 2.2.15 2019-02-11 21:01:30 -06:00
Benedict Elliott Smith 2209115972 Merge branch 'cassandra-3.11' into trunk 2019-02-05 10:53:05 +00:00
Benedict Elliott Smith a6059f1fee Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-05 10:52:17 +00:00
Benedict Elliott Smith aa2a5c6994 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-02-05 10:51:28 +00:00
Benedict Elliott Smith c100f1ac40 Multi-version in-JVM dtests
patch by Benedict; reviewed by Alex Petrov for CASSANDRA-14937
2019-02-05 10:49:16 +00:00
Michael Shuler fd47391aae Update version to 3.11.4 2019-02-01 12:40:38 -06:00
Michael Shuler edd52cef50 Update version to 3.0.18 2019-02-01 12:38:25 -06:00
Michael Shuler af91658353 Update version to 2.2.14 2019-02-01 12:36:13 -06:00
Michael Shuler 9bb75358df Update version to 2.1.21 2019-02-01 12:33:15 -06:00
Benedict Elliott Smith 2d05bff0ba Merge branch 'cassandra-3.0' into cassandra-3.11 2019-01-21 17:44:36 +00:00
Benedict Elliott Smith 459945bcf4 Merge branch 'cassandra-2.2' into cassandra-3.0 2019-01-21 17:43:26 +00:00
Joseph Lynch 8ad4a9a522 In JVM dtests need to clean up after instance shutdown
Adds additional cleanup logic to ensure we don't leak classloaders and
their associated objects when running the in JVM dtests.

Patch by Joseph Lynch; reviewed by Alex Petrov for CASSANDRA-14922
2019-01-21 10:13:48 +00:00
Alex Petrov 1d5e0301f3 Introduce in-jvm distributed tests
Patch by Alex Petrov and Benedict Elliott Smith; reviewed by Benedict Elliott Smith and Dinesh Joshi for CASSANDRA-14821.

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2019-01-21 10:13:48 +00:00
Michael Shuler f8e32649a3 Merge branch 'cassandra-3.11' into trunk 2019-01-14 11:40:11 -06:00
Michael Shuler 6a7aa0f07e Merge branch 'cassandra-3.0' into cassandra-3.11 2019-01-14 11:39:15 -06:00
Michael Shuler 24a708dbcd Merge branch 'cassandra-2.2' into cassandra-3.0 2019-01-14 11:37:56 -06:00
Michael Shuler 900292b2e4 Merge branch 'cassandra-2.1' into cassandra-2.2 2019-01-14 11:37:19 -06:00
Michael Shuler 6506684b81 Update release checksum algorithms to SHA-256, SHA-512
Patch by Michael Shuler; reviewed by Brandon Williams for CASSANDRA-14970
2019-01-14 11:26:03 -06:00
Michael Shuler 315d23b184 Update git.apache.org URLs to gitbox.apache.org 2019-01-09 13:35:44 -06:00
Michael Shuler 0d81fca44e Update URLs for gitbox.apache.org migration 2019-01-09 14:17:03 +00:00
Joseph Lynch d5005627b0 In JVM dtests need to clean up after instance shutdown
Adds additional cleanup logic to ensure we don't leak classloaders and
their associated objects when running the in JVM dtests.

Patch by Joseph Lynch; reviewed by Alex Petrov for CASSANDRA-14922
2019-01-09 15:00:16 +01:00
Marcus Eriksson 11384c3279 Merge branch 'cassandra-3.11' into trunk 2018-12-20 13:44:53 +01:00
Marcus Eriksson 08363afa53 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-12-20 13:41:48 +01:00
Marcus Eriksson 23d722ee3a move task definition inside testmacro to not fail build if ant-junit is not installed
Patch by marcuse; reviewed by Jon Meredith for CASSANDRA-14915
2018-12-20 13:38:28 +01:00
Alex Petrov f22fec927d Introduce in-jvm distributed tests
Patch by Alex Petrov and Benedict Elliott Smith; reviewed by Benedict Elliott Smith and Dinesh Joshi for CASSANDRA-14821.

Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2018-11-16 19:41:58 +01:00
Aleksey Yeshchenko bf6ddb3bc8 Merge branch 'cassandra-3.11' into trunk 2018-10-23 23:35:49 +01:00
Aleksey Yeshchenko 6308fb21da Merge branch 'cassandra-3.0' into cassandra-3.11 2018-10-23 23:27:09 +01:00
Jon Meredith e07d53aaec Fix flaky LongBufferPoolTest
patch by Jon Meredith; reviewed by Dinesh Joshi for CASSANDRA-14790
2018-10-23 23:22:13 +01:00
Jay Zhuang 876666abe7 Enable snapshot artifacts publish
So "ant publish" is able to upload snapshot artifacts to artifactory.

patch by Jay Zhuang; reviewed by Mick Semb Wever for CASSANDRA-12704
2018-09-27 17:39:22 -07:00
Sam Tunnicliffe 65fb17a88b Add checksumming to the native protocol
Patch my Michael Kjellman and Sam Tunnicliffe; reviewed by Dinesh Joshi
and Jordan West for CASSANDRA-13304
2018-09-01 22:41:37 +01:00
Marcus Eriksson f83bd5ac2b Add fqltool compare
Patch by marcuse; reviewed by Jason Brown and Dinesh Joshi for CASSANDRA-14619
2018-09-01 09:59:21 +02:00
Jay Zhuang 2e59ea8c7f Improve BTree build performance by avoiding data copy
patch by Jay Zhuang; reviewed by Benedict for CASSANDRA-9989
2018-08-30 07:48:10 -07:00
Jason Brown a4053682e8 Update netty to 4.1.128
patch by jasobrown; reviewed by Dinesh Joshi for CASSANDRA-14633
2018-08-10 05:13:35 -07:00
Marcus Eriksson 9bc15bacea Default project generation to java8
Patch by marcuse; reviewed by Benedict for CASSANDRA-14613
2018-07-31 15:57:56 +02:00