Commit Graph

1087 Commits

Author SHA1 Message Date
Guy Bolton King e722046406 Update cassandra.yaml documentation for batch_size thresholds
Take account of changes in CASSANDRA-10876

Patch by Guy Bolton King; reviewed by Joel Knighton for CASSANDRA-12761
2016-10-14 17:14:57 +01:00
Stefania Alborghetti 2e18adf257 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-04 09:54:18 +08:00
Alex Petrov 5115c106db Unify drain and shutdown processes
Patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-12509
2016-10-04 09:51:51 +08:00
Edward Capriolo f92f959eb3 CASSANDRA-12688 strongly suggest leaving -ea on 2016-09-22 10:39:47 -07:00
Sergio Bossa d43b9ce509 Support optional backpressure strategies at the coordinator
patch by Sergio Bossa; reviewed by Stefania Alborghetti for CASSANDRA-9318
2016-09-20 09:07:36 +08:00
Paulo Motta 8af61ac311 Add keep-alive to streaming
patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11841
2016-08-31 16:03:00 -05:00
Shogo Hoshii 6966fcda9b Added slow query log
patch by Shogo Hoshii and Stefania Alborghetti; reviewed by Tyler Hobbs
and Stefania Alborghetti for CASSANDRA-12403
2016-08-17 10:47:14 +08:00
Ariel Weisberg 6dfc1e7eeb Deprecate memtable_cleanup_threshold and set memtable_flush_writers default to 2.
Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-12228
2016-08-04 14:30:04 +02:00
Josh McKenzie 503148b3d4 Merge branch 'cassandra-3.9' into trunk 2016-07-27 12:16:30 -04:00
Josh McKenzie d22e3908b6 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-27 12:16:23 -04:00
Paulo Motta d6232e04d7 Add missing options to cassandra-env.ps1
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10939
2016-07-27 12:15:31 -04:00
Paulo Motta 01d5fa8acf Fix Java Version check for versions > 100 on Windows (3.0 patch)
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
2016-07-27 11:41:17 -04:00
Josh McKenzie 6284b6dcce Merge branch 'cassandra-3.9' into trunk 2016-07-27 11:40:09 -04:00
Paulo Motta 247a56bca7 Fix Java Version check for versions > 100 on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
2016-07-27 11:39:28 -04:00
Jérôme Mainaud e1393ec54f Unify STDOUT and SYSTEMLOG logback format
Patch by Jérôme Mainaud; Reviewed by Paulo Motta for CASSANDRA-12004
2016-07-27 15:38:32 +01:00
T Jake Luciani dc9ed46341 Improve write path performance
Patch by tjake; reviewed by Stefania Alborghetti for CASSANDRA-12269
2016-07-26 14:55:54 -04:00
Jonathan Ellis 16086998e1 update cassandra.yaml comments post-CASSANDRA-10243 2016-07-26 10:58:44 -05:00
Jonathan Ellis addf9c2c8e Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-26 10:58:13 -05:00
Jonathan Ellis 023d2e98f1 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-26 10:54:55 -05:00
Jonathan Ellis 04ef62cba2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-26 10:54:43 -05:00
Jonathan Ellis 48a45eda50 update cassandra.yaml comments post-CASSANDRA-10243 2016-07-26 10:54:31 -05:00
Sam Tunnicliffe 9eae8d340c Use custom RMI registry to avoid issues with JMX and SSL
Patch by Sam Tunnicliffe; reviewed by Jake Luciani for CASSANDRA-12109
2016-07-20 13:06:02 +01:00
Josh McKenzie 76188e9520 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-11 16:29:58 -04:00
Josh McKenzie e99ee19950 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-11 16:28:22 -04:00
Jeff Jirsa f0d1d75ebf Make GCInspector min log duration configurable
Patch by jjirsa; reviewed by jmckenzie for CASSANDRA-11715
2016-07-11 16:27:04 -04:00
Stefania Alborghetti 78f077de07 Revert "Update to Netty 4.0.37"
This reverts commit e8d7fe8a28.
2016-07-06 12:58:06 +08:00
Josh McKenzie c86b3e1830 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-30 16:33:53 -04:00
Josh McKenzie 6b241097b4 revert CASSANDRA-11949 3.0+ 2016-06-30 16:33:34 -04:00
Josh McKenzie 82cdc8617a Revert "Fix GC logging on first start"
This reverts commit 3a61c10659.
2016-06-30 16:31:43 -04:00
Josh McKenzie 8f5b8db589 Revert "Ninja: suppress printed output on dir creation in Win32 startup"
This reverts commit 3041034fb9.
2016-06-30 16:31:32 -04:00
Josh McKenzie 1d9d56659e Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-30 13:36:33 -04:00
Josh McKenzie 1991fea8bf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-30 13:36:17 -04:00
Josh McKenzie 3041034fb9 Ninja: suppress printed output on dir creation in Win32 startup 2016-06-30 13:35:20 -04:00
Josh McKenzie 0294fd8911 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-06-28 13:47:49 -04:00
Josh McKenzie 2395f9e467 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-28 13:47:24 -04:00
Mahdi Mohammadi 3a61c10659 Fix GC logging on first start
Patch by mmohammadi; reviewed by jmckenzie for CASSANDRA-11949
2016-06-28 13:46:38 -04:00
Sylvain Lebresne c7b9401bf8 Merge branch 'doc_in_tree' into trunk
* doc_in_tree:
  Modify build file to include html doc in artifacts
  Add 'report bug' section
  Fix minor errors in CQL doc
  Finish fixing the CQL doc
  Don't track auto-generated file
  Reorganize document
  Automatically generate docs for cassandra.yaml
  Fix CQL doc (incomplete)
  Add Metrics/Monitoring docs
  Add Change Data Capture documentation
  Docs for Memtable and SSTable architecture
  Add doc on compaction
  Add initial version of security section
  Fill in Replication, Tuneable Consistency sections
  Add docs for cqlsh
  Add snitch and range movements section on Operations
  Add initial in-tree documentation (very incomplete so far)
2016-06-27 20:33:21 +02:00
Tyler Hobbs f2f3071443 Automatically generate docs for cassandra.yaml 2016-06-21 19:53:48 +02:00
Robert Stupp e8d7fe8a28 Update to Netty 4.0.37
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12032
2016-06-21 16:47:37 +02:00
Josh McKenzie e31e216234 Add Change Data Capture
Patch by jmckenzie; reviewed by cyeksigian and blambov for CASSANDRA-8844
2016-06-16 10:01:39 -04:00
Josh McKenzie 60e5e0ef4c Merge branch 'cassandra-3.0' into trunk 2016-06-14 11:13:42 -04:00
Josh McKenzie 3c531cbec9 Fix example metrics
Patch by cbate; reviewed by jmckenzie for CASSANDRA-11481
2016-06-14 11:13:31 -04:00
Stefania Alborghetti 68d20edb2b Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-26 10:52:31 +08:00
Alex Petrov 85cc390189 Prevent OOM failures on SSTable corruption, improve tests for corruption detection
Patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-9530
2016-05-26 10:51:06 +08:00
Yuki Morishita f39a352fdf Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-25 19:35:20 -05:00
Yuki Morishita e000ebbe50 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-05-25 19:30:52 -05:00
Yuki Morishita 2bacc9a5c7 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-05-25 19:28:01 -05:00
Paulo Motta d27f9b0b77 Set default streaming_socket_timeout_in_ms to 24 hours
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11840
2016-05-25 19:26:51 -05:00
Josh McKenzie 54d7fc4b02 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-03 14:06:57 -04:00
Josh McKenzie c7d216e3fe Merge branch 'cassandra-2.2' into cassandra-3.0 2016-05-03 14:06:18 -04:00
Josh McKenzie 8bf453a449 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-05-03 14:05:23 -04:00
Eduard Tudenhoefner 5202147d9f Use -lt comparator for JVM patch version
Patch by etudenhoefner; reviewed by mshuler for CASSANDRA-11661
2016-05-03 14:04:16 -04:00
Robert Stupp 9581209b35 Make prepared statement cache size configurable
patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-11555
2016-05-02 17:03:56 +02:00
Sam Tunnicliffe 7b0c7164aa Integrated JMX Authentication and Authorization
Patch by Jan Karlsson and Sam Tunnicliffe; reviewed by Jake Luciani for
CASSANDRA-10091
2016-05-02 11:44:48 +01:00
Branimir Lambov 30bb255ec9 Add uncompressed chunk cache for RandomAccessReader
patch by Branimir Lambov; reviewed by Pavel Yaskevich for CASSANDRA-5863
2016-04-28 22:14:42 -07:00
Aleksey Yeschenko 4254de17f4 Merge branch 'cassandra-3.0' into trunk 2016-04-27 18:26:22 +01:00
Blake Eggleston 7a2be8fa4a Don't require HEAP_NEW_SIZE to be set when using G1
patch by Blake Eggleston; reviewed by Paulo Motta for CASSANDRA-11600
2016-04-27 18:25:04 +01:00
Robert Stupp ef5bbedd68 Support large partitions on the 3.0 sstable format
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-11206
2016-04-21 16:48:26 +02:00
Aleksey Yeschenko cb1a63474d Merge branch 'cassandra-3.0' into trunk 2016-04-11 19:18:42 +01:00
Aleksey Yeschenko 5dbeef3f51 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-11 19:16:39 +01:00
Aleksey Yeschenko ab2b8a60c4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-11 19:15:47 +01:00
Stefania Alborghetti c1b1d3bccf Checking if an unlogged batch is local is inefficient
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11529
2016-04-11 19:12:25 +01:00
Josh McKenzie bd633377a9 Merge branch 'cassandra-3.0' into trunk 2016-04-06 18:57:43 -04:00
Josh McKenzie 04a75a6344 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-06 18:45:09 -04:00
Josh McKenzie 96c53e0a5e Fix launch with whitespace in path on Windows
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-11515
2016-04-06 18:37:08 -04:00
Tyler Hobbs 3efcdc5f45 Merge branch 'cassandra-3.5' into trunk 2016-04-01 12:36:42 -05:00
Tyler Hobbs 496418ce07 Merge branch 'cassandra-3.0' into cassandra-3.5
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/copyutil.py
2016-04-01 12:32:01 -05:00
Stefania Alborghetti 98086b65d0 cqlsh: Improve backoff policy for COPY FROM
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-11320
2016-04-01 12:29:01 -05:00
Kaide Mu 761dfc2c83 Compress only inter-dc traffic by default
patch by Kaide Mu; reviewed by Paulo Motta for CASSANDRA-8888
2016-03-29 17:51:58 +01:00
Stefan Podkowinski c9c9c42263 Hostname verification for node-to-node encryption
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-9220
2016-03-28 13:02:50 +02:00
Stefania Alborghetti 1ad9d55675 COPY TO should have higher double precision
patch by Stefania; reviewed by slebresne for CASSANDRA-11255
2016-03-18 10:56:49 +01:00
Stefan Podkowinski e4a0a4bf65 Remove hard-coded SSL cipher suites and protocols
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-10508
2016-03-16 20:36:44 +01:00
Yuki Morishita 9d527ed257 Merge branch 'cassandra-3.5' into trunk 2016-03-10 13:03:21 -06:00
Yuki Morishita 10d61d46d3 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-10 13:03:15 -06:00
Yuki Morishita c9d2b7addc Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-10 13:01:30 -06:00
Yuki Morishita b9ff7fe137 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-03-10 13:00:09 -06:00
Paulo Motta 561000aa30 Fix streaming_socket_timeout_in_ms not enforced
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11286
2016-03-10 12:54:24 -06:00
Sylvain Lebresne b78117cf3b Proper handling of IcedTea when finding jvm version in cassandra-env.sh
patch by brandon.williams; reviewed by mshuler for CASSANDRA-8890
2016-03-08 10:30:37 +01:00
Stefan Podkowinski 70649a8d65 Add cqlshrc option to always connect using ssl
patch by Stefan Podkowinski; reviewed by Paulo Motta for CASSANDRA-10458
2016-02-29 18:21:05 +00:00
Paulo Motta a12188cd4e cqlsh: change default encoding to UTF-8
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11124
2016-02-24 05:46:08 -08:00
Jason Brown d7e0c30186 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-24 05:44:41 -08:00
Paulo Motta 66b0d3f016 cqlsh: change default encoding to UTF-8
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11124
2016-02-24 05:43:00 -08:00
Joshua McKenzie 9492efb3c4 Merge branch 'cassandra-3.0' into trunk 2016-02-17 19:24:06 -05:00
Joshua McKenzie 5dbab32042 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-17 19:23:10 -05:00
Stefan Podkowinski 128d144c0d cqlsh: Add local timezone support to cqlsh
patch by Stefan Podkowinski; reviewed by Paulo Motta for CASSANDRA-10397
2016-02-17 19:22:17 -05:00
Sam Tunnicliffe 186777aac5 Refactor auth caches and add credentials cache
Patch by Sam Tunnicliffe; reviewed by Mike Adamson for CASSANDRA-7715
2016-02-17 17:03:11 +00:00
Jason Brown 90033b921b Encrypted hints
patch by jasobrown; reviewed by Blake Eggleston for CASSANDRA-11040
2016-02-10 14:21:01 -08:00
Tyler Hobbs 93f77c74da Merge branch 'cassandra-3.0' into trunk 2016-02-05 16:35:13 -06:00
Tyler Hobbs 11bddad51f Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-05 16:34:47 -06:00
Tyler Hobbs 66229705d7 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-05 16:34:25 -06:00
Tyler Hobbs 26aa19e583 Add entries for all options to cqlsh.sample
Patch by Tyler Hobbs; reviewed by Lorina Poland for CASSANDRA-10622
2016-02-05 16:33:19 -06:00
Benedict Elliott Smith 2f41243191 9472: Reintroduce Off-Heap Memtables
patch by benedict and stefania
2016-01-27 10:49:26 +00:00
Jason Brown 7374e9b5ab Encrypted commit logs
patch by jasobrown; reviewed by blambov for (CASSANDRA-6018)
2016-01-19 07:00:32 -08:00
Ariel Weisberg 87d80b478b Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-08 10:32:22 +01:00
Sylvain Lebresne 15cfeb779e Merge branch 'cassandra-3.0' into cassandra-3.3 2016-01-07 12:03:52 +01:00
Sylvain Lebresne 601203cbcf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-01-07 12:03:39 +01:00
Sylvain Lebresne e41fa34191 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-07 12:03:26 +01:00
Jeremy Hanna 6d6d189042 Fix inter datacenter streaming default
patch by jeromatron; reviewed by aweisberg for CASSANDRA-9708
2016-01-07 11:54:51 +01:00
Stefania Alborghetti 85b8d02aae Match cassandra-loader options in COPY FROM (3.2 version)
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
2016-01-06 18:00:46 +01:00
Stefania Alborghetti f288387917 Match cassandra-loader options in COPY FROM (3.0 version)
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
2016-01-06 17:58:20 +01:00
Stefania Alborghetti 202cf9b0be Match cassandra-loader options in COPY FROM (2.2 version)
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
2016-01-06 17:56:30 +01:00
Stefania Alborghetti 11716547f8 Match cassandra-loader options in COPY FROM
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
2016-01-06 17:54:49 +01:00
Sylvain Lebresne f937c8bee8 Revert wrong line removal from bad merge 2016-01-06 14:44:29 +01:00
Ariel Weisberg 3e45fa1ab5 Enable GC logging by default (3.0 version)
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-05 18:01:29 +01:00
Ariel Weisberg c04bf2a9bb Enable GC logging by default
patch by Chris Lohfink; reviewed by aweisberg for CASSANDRA-10140
2016-01-05 17:49:42 +01:00
Marcus Eriksson e2c6341898 Make sure the same token does not exist in several data directories
Patch by marcuse; reviewed by Yuki Morishita and Carl Yeksigian for CASSANDRA-6696
2016-01-05 16:48:50 +01:00
Paulo Motta 869bdabf42 Move static JVM options to jvm.options file
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10494
2016-01-04 14:17:00 -05:00
Blake Eggleston c20566fa64 Implement hints compression
Patch by bdeggleston; reviewed by jmckenzie for CASSANDRA-9428
2015-12-24 07:16:07 -05:00
Sylvain Lebresne d55a51e952 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-11 17:58:48 +01:00
Paulo Motta 94c361d1a7 Add property to allow listening on broadcast_address (CASSANDRA-9748)
patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-9748
2015-12-11 17:56:45 +01:00
Robert Stupp 9a2fd8ccf3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 15:26:02 +01:00
Robert Stupp 0ee8895b27 Show CQL help in cqlsh in web browser
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
2015-11-27 15:24:51 +01:00
Sylvain Lebresne 039ff1f883 Fix comment about ParallelGCThreads
patch by zznate; reviewed by pauloricardomg for CASSANDRA-10702
2015-11-20 13:19:46 +01:00
Robert Stupp 46da70e1fc Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-19 10:42:11 +01:00
Hobin Yoon 4e4832427a Fix typo in cassandra.yaml
patch by Hobin Yoon; reviewed by Robert Stupp for CASSANDRA-10705
2015-11-19 10:41:26 +01:00
Robert Stupp 242b9738f2 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 23:29:44 +01:00
Robert Stupp 0ff13d2a68 get JEMAlloc debug output out of nodetool output
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628
2015-11-04 23:28:57 +01:00
Aleksey Yeschenko d2b7864fe9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 12:59:27 +00:00
Aleksey Yeschenko b4b268407f Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-04 12:58:21 +00:00
Mike Adamson dc73c0b31f Fix logback-tools.xml incorrectly configured for outputing to System.err
patch by Mike Adamson; reviewed by Jeremiah Jordan for CASSANDRA-9937
2015-11-04 12:26:12 +00:00
Robert Stupp 4b47d711ec Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-28 20:13:49 +01:00
Robert Stupp 83fcc926eb Update cassandra.yaml comments to reflect memory_allocator deprecation, remove in 3.0
patch by Robert Stupp; reviewed by Jim Witschey for CASSANDRA-10581
2015-10-28 20:12:25 +01:00
Robert Stupp 734a3bfa78 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-28 14:18:25 +01:00
Norman Maurer 32a6f2059a Support encrypted and plain traffic on the same port
patch by Norman Maurer; reviewed by Robert Stupp for CASSANDRA-10559
2015-10-28 14:17:18 +01:00
Norman Maurer 535c3ac759 Support encrypted and plain traffic on the same port
patch by Norman Maurer; reviewed by Robert Stupp for CASSANDRA-10559
2015-10-23 14:44:18 +02:00
Aleksey Yeschenko bc5f167366 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-21 21:10:21 +01:00
Aleksey Yeschenko 12e38f7f8e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-21 21:09:46 +01:00
Carl Yeksigian 29ff1f2ac2 (phrasing) replace 'wipe' with 'decomission' 2015-10-21 20:59:33 +01:00
Paulo Motta fa909cc420 Fix MAX_HEAP_SIZE check on Windows startup
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553
2015-10-19 15:12:19 -04:00
Paulo Motta 1415fa512a Revert 7486, make CMS default GC, move gc opts to conf/jvm.options
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10403
2015-10-14 14:36:52 -04:00
Aleksey Yeschenko f21c888510 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-14 16:02:56 +01:00
Aleksey Yeschenko 7cab327245 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-14 15:54:25 +01:00
Carl Yeksigian 711870e348 Don't allow startup if the node's rack has changed
patch by Carl Yeksigian; revieiwed by Paulo Motta for CASSANDRA-10242
2015-10-14 15:35:09 +01:00
Robert Stupp a9db74b30f Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-09 13:14:53 +02:00
Robert Stupp 82dabe0cf5 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-09 13:10:01 +02:00
Thorkild Stray ad93f3b6eb Allow LOCAL_JMX to be easily overridden
patch by Thorkild Stray ; reviewed by Robert Stupp for CASSANDRA-10275
2015-10-09 13:06:33 +02:00
Marcus Eriksson 36d0f55d46 Update cassandra.yaml allocate_tokens_for_keyspace to match the actual config variable 2015-10-07 13:57:13 +02:00
Sylvain Lebresne 566799f567 Remove (unsupported) offheap_objects option
patch by slebresne; reviewed by aweisberg for CASSANDRA-10437

The 'objects offheap' allocator is currently not implemented for
Cassandra 3.0. The option will be re-introduced by CASSANDRA-9472
in a future release but in the meantime, the patch properly remove
the (now broken) option.
2015-10-07 10:45:40 +02:00
Tushar Agrawal 2084f3fb19 Document commitlog segment size and max mutations size link
patch by Tushar Agrawal; reviewed by Chris Gerlt for CASSANDRA-10256
2015-10-02 14:45:04 -07:00
blerer aa60cde312 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-22 22:10:30 +02:00
Paulo Motta 4a849efeb7 Add a separate production debug log for troubleshooting
patch by Paulo Motta; reviewed by Ariel Weisberg  for CASSANDRA-10241
2015-09-22 22:00:23 +02:00
Joshua McKenzie 00264e8547 Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/Config.java
2015-09-11 13:13:03 -04:00
Joshua McKenzie 53d0449170 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
	conf/cassandra.yaml
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
	src/java/org/apache/cassandra/service/GCInspector.java
2015-09-11 13:00:40 -04:00
Joshua McKenzie 488db6f506 Add configurable warning threshold for GC duration
Patch by jmckenzie and achowdhery for CASSANDRA-8907
2015-09-11 12:54:30 -04:00
Stefan Podkowinski a7895cfb2c Support for both encrypted and unencrypted native transport connections
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-9590
2015-09-05 18:23:10 +02:00
Joshua McKenzie e9c0e1787e Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	CHANGES.txt
2015-09-03 12:42:04 -04:00
Joshua McKenzie e1fc0e0671 Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
2015-09-03 12:39:43 -04:00
Stefania Alborghetti 53a177a915 Improve batchlog write path
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9673
2015-09-02 08:43:42 +01:00
Joshua McKenzie 45eba1adbb Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	conf/cassandra-env.ps1
2015-09-01 16:29:39 -04:00
Joshua McKenzie 3effec53e3 ninja: remove vestigial log4j from cassandra-env.ps1 2015-09-01 16:29:03 -04:00
Jonathan Ellis e805f1466b merge from 2.2 2015-08-28 17:01:36 -05:00
Jonathan Ellis 8bc32ba081 Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
reviewed by aweisberg for CASSANDRA-10199
2015-08-28 16:55:56 -05:00
blerer c1740a2132 Merge branch cassandra-2.2 into cassandra-3.0 2015-08-26 15:24:38 +02:00
blerer 2ac45aed90 Merge branch cassandra-2.1 into cassandra-2.2 2015-08-26 15:22:04 +02:00
Robert Coli 7e1ea4c8c1 Change streaming_socket_timeout_in_ms default
patch by Robert Coli; reviewed by Benjamin Lerer for CASSANDRA-8611
2015-08-26 15:16:47 +02:00
Joshua McKenzie a3d9e6c479 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-24 12:44:34 -04:00
Joshua McKenzie 2d477a4cc2 Speed up launch scripts on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9615
2015-08-24 12:44:00 -04:00
Aleksey Yeschenko 96d41f0e0e Rewrite hinted handoff
patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-6230
2015-08-19 17:27:22 +03:00
Joshua McKenzie f50e9321f7 ninja fix typo in cassandra-env.ps1 2015-08-18 13:40:25 -04:00
Joshua McKenzie 1288427669 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-14 11:50:40 -04:00
Joshua McKenzie 10be826e7a ninja remove unnecessary prints from Windows startup scripts 2015-08-14 11:49:32 -04:00
Philip Thompson 0997ad6fff Require java 8u40
Patch by pthompson; reviewed by jmckenzie for CASSANDRA-9416
2015-08-11 10:08:27 -04:00
Robert Stupp e37d577b6c Disable scripted UDFs by default
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9889
2015-08-04 00:05:30 +02:00
T Jake Luciani 3c43775c75 Revert "Revert "Materialized Views""
This reverts commit 24d185d72b.
2015-07-29 18:29:32 -04:00
Jonathan Ellis 24d185d72b Revert "Materialized Views"
This reverts commit 3bdcaa336a.
2015-07-29 17:03:52 -05:00
Carl Yeksigian 3bdcaa336a Materialized Views
patch by carl; reviewed by jmckenzie for CASSANDRA-6477
2015-07-29 16:15:53 -04:00
Benedict Elliott Smith 8f70bb2f5d Permit disabling commit log segment recycling, and disable by default
patch by benedict; reviewed by driftx for CASSANDRA-9896
2015-07-28 17:34:25 +01:00
Stefania Alborghetti 6422e34769 Reduce IOP cost for small reads
Makes default buffer size for (uncompressed) buffered reads smaller,
based on the expected partition size

patch by stefania; reviewed by benedict for CASSANDRA-8894
2015-07-28 15:31:13 +01:00
Robert Stupp 7a6c3272e3 Disable UDFs again
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9402
2015-07-24 14:22:21 +02:00
Robert Stupp 5790b4a44b Implement proper sandboxing for UDFs
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-9402
2015-07-24 11:37:26 +02:00
Joshua McKenzie c912668782 Merge branch 'cassandra-2.2' into trunk
Conflicts:
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
2015-07-23 11:13:20 -04:00
Joshua McKenzie 53b64a406b Warn on non-high perf power profile on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9648
2015-07-23 11:11:39 -04:00
Marcus Eriksson 3b5ab3a473 Merge branch 'cassandra-2.2' into trunk
Conflicts:
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
2015-07-13 19:28:12 +02:00
Marcus Eriksson 5a090cc5a1 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/service/CassandraDaemon.java
2015-07-13 19:23:41 +02:00
Stefania Alborghetti 1ecccede7d Handle corrupt files on startup
Patch by stefania; reviewed by marcuse for CASSANDRA-9686
2015-07-13 19:03:37 +02:00
Stefania Alborghetti fae9d3beac Warn when an extra-large partition is compacted, CASSANDRA-9643 2015-07-02 11:58:15 -07:00
Stefania Alborghetti 492c65a677 Warn when an extra-large partition is compacted, CASSANDRA-9643 2015-07-02 11:57:30 -07:00
Stefania Alborghetti 921eb7e806 Warn when an extra-large partition is compacted, CASSANDRA-9643 2015-07-02 11:37:50 -07:00
Stefania Alborghetti e89d54865e Change hinted_handoff_enabled yaml setting, JMX
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9035
2015-07-01 19:43:33 +03:00
Jason Brown e7852a3e56 Merge branch 'cassandra-2.2' into trunk 2015-06-25 10:45:43 -07:00
Jason Brown f4449bd455 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeProbe.java
2015-06-25 10:45:02 -07:00
Jason Brown 628394a6fa Allow JMX over SSL directly from nodetool
patch by Marcus Olsson, reviewed by jasobrown for CASSANDRA-9090
2015-06-25 10:36:42 -07:00
branimir 9a3fa887cf Add algorithmic token allocation
patch by branimir; reviewed by benedict for CASSANDRA-7032
2015-06-23 12:03:45 +01:00
Josh McKenzie 115ed236aa Merge branch 'cassandra-2.2' into trunk 2015-06-22 17:27:46 -04:00
Josh McKenzie d6d32d26ff Change Windows Kernel default timer resolution
Patch by jmckenzie; reviewed by tjake for CASSANDRA-9634
2015-06-22 17:27:08 -04:00
Yuki Morishita 7a8be78507 Merge branch 'cassandra-2.2' into trunk 2015-06-16 17:43:39 -05:00
Yuki Morishita 514dcd944c Add logback metrics
patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-9378
2015-06-16 17:39:00 -05:00
stefania 17dd4ccc78 Remove FileCacheService, instead pooling buffers
patch by stefania and benedict for CASSANDRA-8897
2015-06-09 10:08:24 +01:00
Jason Brown 255e5f14ca Merge branch 'cassandra-2.2' into trunk 2015-06-05 05:41:55 -07:00
Jason Brown 675a0f4713 Compressed commit log should measure compressed space used
patch by blambov; reviewed by jasobrown from CASSANDRA-9095
2015-06-05 05:39:29 -07:00
Jonathan Ellis 06b2bd3b88 Merge branch 'cassandra-2.2' into trunk 2015-06-03 10:32:08 -07:00
Jonathan Ellis 4cc5fd10de merge from 2.1 2015-06-03 10:32:01 -07:00
Jonathan Ellis 80ef282570 Default commitlog_sync_batch_window_in_ms changed to 2ms
patch by jbellis; reveiwed by bes for CASSANDRA-9504
2015-06-03 10:29:39 -07:00
Al Tobey ea36ae9e8a Change default GC to G1
Patch by Al Tobey; reviewed by jmckenzie for CASSANDRA-7486
2015-05-28 13:01:03 -04:00
Jonathan Ellis 61bea5a0d9 Explain that UDF security manager will be coming in 3.0 2015-05-27 17:02:06 -05:00
Branimir Lambov f9c998cbc3 Update commitlog archiving docs now that segments aren't recycled
Patch by Branimir Lambov; reviewed by Ariel Weisberg for CASSANDRA-9350
2015-05-27 12:03:22 -05:00
Aleksey Yeschenko b540c5d208 Fix setting the PerfDisableSharedMem JVM option 2015-05-21 03:37:38 +03:00
Robert Stupp 6c0a462624 Add a flag in cassandra.yaml to enable UDFs
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9404
2015-05-15 22:01:38 +02:00
Aleksey Yeschenko fa4a020ac9 Don't start Thrift rpc by default (CASSANDRA-9319)
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-9319
2015-05-12 16:02:53 +03:00
Robert Stupp 7b23b95fde Startup slowdown due to preloading jemalloc
Patch by Robert Stupp; Reviewed by Philip Thompson for CASSANDRA-9197
2015-05-12 10:40:10 +02:00