Commit Graph

23798 Commits

Author SHA1 Message Date
Michael Shuler c0aa79e545 CVE-2017-5929 Security vulnerability and redefine default log rotation policy.
Patch by Michael Shuler; Reviewed by Ariel Weisberg for CASSANDRA-14183
2018-02-14 16:30:43 -05:00
Ariel Weisberg 44ce9536ff Merge branch 'cassandra-3.11' into trunk 2018-02-14 13:36:58 -05:00
Ariel Weisberg 630c18eb38 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-14 13:36:30 -05:00
Ariel Weisberg 2461187c0e Merge branch 'cassandra-2.2' into cassandra-3.0 2018-02-14 13:32:59 -05:00
Ariel Weisberg 08ebe8297b Merge branch 'cassandra-2.1' into cassandra-2.2 2018-02-14 13:23:41 -05:00
Ariel Weisberg 4bbd28a043 CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-14183
2018-02-14 11:55:00 -05:00
Jay Zhuang 7a424bc2a7 Update Intellij JUnit configuration
And other ninja build fixes.

patch by Jay Zhuang; reviewed by Stefan Podkowinski for CASSANDRA-14169
2018-02-14 16:32:24 +01:00
Jason Brown cf66b7ea2d Merge branch 'cassandra-3.11' into trunk 2018-02-14 05:25:31 -08:00
kurt 1d506f9d09 Fix ReadCommandTest
patch by Kurt Greaves; reviewed by jasobrown for CASSANDRA-14234
2018-02-14 05:19:48 -08:00
Jason Brown 74b2013ea2 Merge branch 'cassandra-3.11' into trunk 2018-02-14 05:02:15 -08:00
Samuel Roberts d10e6ac606 Remove trailing period from latency reports at keyspace level
patch by Samuel Roberts; reviewed by Chris Lohfink for CASSANDRA-14233
2018-02-14 04:59:45 -08:00
Stefan Podkowinski bb9aa09881 Use JRE default key store algorithm instead of SunX509
patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANRA-13259
2018-02-14 11:29:59 +01:00
Jason Brown 0bc2164df2 Merge branch 'cassandra-3.11' into trunk 2018-02-13 15:41:29 -08:00
Jason Brown 30c35dd8a4 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-13 15:07:48 -08:00
Dinesh Joshi 890f319142 Fix unit test failures in ViewComplexTest
patch by Dinesh Joshi; reviewed by jasobrown for CASSANDRA-14219
2018-02-13 15:00:57 -08:00
Dave Brosius 834f2a6ecd Fix comparison of address and port for repair and messages
Patch by Dave Brosius; Reviewed by Ariel Weisberg for CASSANDRA-14225
2018-02-13 17:46:44 -05:00
Ariel Weisberg 518ddbf9d2 Better document in code InetAddressAndPort usage post 7544
Patch by Ariel Weisberg; Reviewed by Jon Haddad for CASSANDRA-14226
2018-02-13 17:20:11 -05:00
Dikang Gu 8a5e88f635
Use new token allocation for non bootstrap case as well.
> patch by Dikang Gu; reviewed by Branimir Lambov for CASSANSRA-13080
backported by Mick Semb Wever; reviewed by Jon Haddad for CASSANSRA-14212
2018-02-13 08:02:02 +11:00
Jason Brown 1188fcb082 Merge branch 'cassandra-3.11' into trunk 2018-02-12 05:16:46 -08:00
Jason Brown f6ec5c5d18 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-12 05:09:58 -08:00
Amichai Rothman 91e83c72de Add MinGW uname check to start scripts
patch by Amichai Rothman; reviewed by jasobrown for CASSANDRA-12940
2018-02-12 05:07:58 -08:00
Paulo Motta 66b2b3f5f3 Merge branch 'cassandra-3.11' into trunk 2018-02-11 15:18:35 -02:00
Paulo Motta fa39b6e277 ninja: fix bad #14092 merge from cassandra-3.0 to cassandra-3.11 2018-02-11 15:17:11 -02:00
Paulo Motta 6034c268c3 Merge branch 'cassandra-3.11' into trunk 2018-02-10 15:03:59 -02:00
Paulo Motta 0a6b6f506b Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-10 14:59:28 -02:00
Paulo Motta c231ed5be0 Merge branch 'cassandra-2.2' into cassandra-3.0 2018-02-10 14:57:53 -02:00
Paulo Motta 1602e60634 Merge branch 'cassandra-2.1' into cassandra-2.2 2018-02-10 14:54:56 -02:00
Paulo Motta b2949439ec Protect against overflow of local expiration time
Patch by Paulo Motta; Reviewed by Sam Tunnicliffe for CASSANDRA-14092
2018-02-10 14:33:50 -02:00
Marcus Eriksson 161c37da8f Merge branch 'cassandra-3.11' into trunk 2018-02-09 16:26:24 +01:00
Marcus Eriksson 6eb65e5a23 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-09 16:22:02 +01:00
Marcus Eriksson a4cf29fe95 Merge branch 'cassandra-3.11' into trunk 2018-02-09 16:17:59 +01:00
Marcus Eriksson 21978bf9bb Use the correct digest file and reload sstable metadata in nodetool verify
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-14217
2018-02-09 15:05:55 +01:00
Dinesh Joshi 473e8dfd7b Add hot reloading of SSL Certificates
patch by Dinesh Joshi; reviewed by jasobrown for CASSANDRA-14222
2018-02-09 05:32:21 -08:00
Vincent White 714703a08d Fix sstablemetadata date string for minLocalDeletionTime
patch by Vince White; reviewed by jasobrown for CASSANDRA-14132
2018-02-09 04:47:39 -08:00
Dave Brosius 43aa79d3cd Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-08 17:50:48 -05:00
Dave Brosius 40148a178b fix test due to change in exception message 2018-02-08 17:49:40 -05:00
Ariel Weisberg 3891598e61 Fix mistakenly unused variable introduced by CASSANDRA-7544 and potential CME in iterator
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-7544
2018-02-08 15:57:39 -05:00
Jon Haddad 9d649d69a5 Count deleted rows scanned during reads for tracing and tombstone thresholds.
If a row is read but is not live anymore (which happens with row level tombstones) it is not counted anywhere
in the metrics nor reported in tracing. Row tombstones themselves are not reported anywhere.
The consequence is that some delete heavy workloads will show no tombstone read but endure severe
performance issues. This commit counts deleted rows as standard tombstone cells.

Patch by Alexander Dejanovski; Reviewed by Jon Haddad for CASSANDRA-8527
2018-02-08 11:01:38 -08:00
Jon Haddad b2d20d4bb1 Count deleted rows scanned during reads for tracing and warning tombstone thresholds.
If a row is read but is not live anymore (which happens with row level tombstones) it is not counted anywhere
in the metrics nor reported in tracing. Row tombstones themselves are not reported anywhere.
The consequence is that some delete heavy workloads will show no tombstone read but endure severe
performance issues. This commit counts deleted rows as standard tombstone cells.

Patch by Alexander Dejanovski; Reviewed by Jon Haddad for CASSANDRA-8527
2018-02-08 10:50:14 -08:00
Marcus Eriksson 0f58f6c650 Make it possible to change neverPurgeTombstones during runtime
Patch by marcuse; reviewed by Chris Lohfink for CASSANDRA-14214
2018-02-08 08:41:39 +01:00
Dave Brosius d0b34d383c node map does not handle InetAddressAndPort correctly.
patch by dbrosius, reviewed by aweisberg for CASSANDRA-14216
2018-02-07 11:46:47 -05:00
Marcus Eriksson 5c3e33b17c Merge branch 'cassandra-3.11' into trunk 2018-02-07 09:10:33 +01:00
Marcus Eriksson d369190964 Merge branch 'cassandra-3.0' into cassandra-3.11 2018-02-07 09:06:19 +01:00
Sumanth Pasupuleti 7885a703d6 Handle error when mutating repairedAt in nodetool verify
Patch by Sumanth Pasupuleti; reviewed by marcuse for CASSANDRA-13933
2018-02-07 09:04:45 +01:00
Jason Brown f2fc2e9673 Remove GossipDigestSynVerbHandler#doSort()
patch by jasobrown; reviewed by Joel Knighton for CASSANDRA-14174
2018-02-06 13:38:46 -08:00
Dave Brosius a8ce4b6cd8 Merge branch 'cassandra-3.11' into trunk 2018-02-05 22:41:39 -05:00
Dave Brosius de6c62dd6c Merge branch cassandra-3.0 into cassandra-3.11 2018-02-05 22:40:56 -05:00
Dave Brosius 7df36056b1 fix parameters to exception message 2018-02-05 22:37:50 -05:00
Dave Brosius 0d26879a95 fix comparison of addresses for event filtering in repair 2018-02-05 22:03:06 -05:00
Dave Brosius 3fc381d5cb fix comparison of addresses for message cross node check 2018-02-05 21:55:59 -05:00