natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,430 Commits 17 Branches 338 Tags 665 MiB
Commit Graph

1278 Commits

Author SHA1 Message Date
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
Jonathan Ellis 28132de16c explain CL compression options 2015-05-08 13:28:34 -05:00
Josh McKenzie e9d1e79943 Merge branch 'cassandra-2.1' into trunk 2015-05-08 12:33:25 -05:00
Josh McKenzie a431d846c1 Fix JVM_EXTRA_OPTS in Windows startup scripts 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9335
 2015-05-08 12:30:17 -05:00
Josh McKenzie bf21df2c3f Merge branch 'cassandra-2.1' into trunk 2015-05-05 13:26:59 -05:00
Benjamin Lerer 233ef3403a (2.1+) Fix remote debugging configuration 
Patch by blerer; reviewed by jmckenzie for CASSANDRA-9297
 2015-05-05 13:25:40 -05:00
Benedict Elliott Smith 184f5b3ad4 revert CASSANDRA-9084 2015-05-01 13:59:03 +01:00
Ariel Weisberg 33f37f86f6 Disable memory mapping of hsperfdata files for JVM statistics 
Patch by Ariel Weisberg; reviewed by jmckenzie for CASSANDRA-9242
 2015-04-29 14:14:08 -05:00
Benedict Elliott Smith 77c40dfc49 Remove line numbers from default logback.xml 
ninja patch by benedict for CASSANDRA-9084
 2015-04-03 23:22:57 +01:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
 2015-04-01 11:11:53 -04:00
T Jake Luciani 150f827364 Merge branch 'cassandra-2.1.4-build' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
 2015-04-01 10:56:05 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
blambov 44f8254df8 Compressed Commit Log 
patch by branimir; reviewed by ariel for CASSANDRA-6809
 2015-03-24 23:42:30 +00:00
Ariel Weisberg 8d570fa799 Merge branch 'cassandra-2.1' into trunk 2015-03-17 19:31:54 +01:00
Ariel Weisberg 89cdfd8e07 DatabaseDescriptor throws NPE when rpc_interface is used 
patch by Ariel Weisberg; reviewed by Carl Yeksigian for CASSANDRA-8839
 2015-03-17 19:27:54 +01:00
Joshua McKenzie ac75ce3e99 Merge branch 'cassandra-2.1' into trunk 2015-03-05 11:37:05 -06:00
Joshua McKenzie b1c2536ccb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2015-03-05 11:32:41 -06:00
Norman Maurer e56d9efb7c Add ability to limit number of native connections 
Patch by Norman Maurer; reviewed by jmckenzie for CASSANDRA-8086
 2015-03-05 10:37:53 -06:00
Robert Stupp 0d2ec11c7e use preloaded jemalloc w/ Unsafe 
Patch by Robert Stupp; Reviewed by Ariel Weisberg for CASSANDRA-8714
 2015-03-05 10:57:03 +01:00
Sam Tunnicliffe b32ce687e7 Make LIST USERS display inherited superuser status 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8849
 2015-03-03 15:58:48 -08:00
Aleksey Yeschenko 56348ea7b7 Merge branch 'cassandra-2.1' into trunk 2015-03-03 15:15:29 -08:00
Aleksey Yeschenko 2acd05d967 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-03 15:14:59 -08:00
Sam Tunnicliffe a936d7e7fb Update example commands in commitlog_archiving.properties 
patch by Sam Tunnicliffe; reviewed by Michael Shuler for CASSANDRA-8290
 2015-03-03 15:12:32 -08:00
Brandon Williams 51057f4cf7 Merge branch 'cassandra-2.1' into trunk 2015-02-10 12:19:58 -06:00
Brandon Williams 88b226b118 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-10 12:19:51 -06:00
Brandon Williams 28c380c96a Mention storage port should not be exposed, either 2015-02-10 12:19:43 -06:00
Brandon Williams 8f5435d063 Merge branch 'cassandra-2.1' into trunk 2015-02-10 12:07:49 -06:00
Brandon Williams 69d07fb03f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	conf/cassandra.yaml
 2015-02-10 12:07:38 -06:00
Brandon Williams ce8501b77d State the obvious. 2015-02-10 11:48:59 -06:00
Benedict Elliott Smith a1f65c34fb Merge branch 'cassandra-2.1' into trunk 2015-01-28 22:44:41 +00:00
Benedict Elliott Smith 160cbc1276 ninja remove commitlog_periodic_queue_size from cassandra.yaml, and @Deprecate in Config.java 2015-01-28 22:44:35 +00:00
Robert Stupp dfd78d0e90 Serializing Row cache alternative, fully off heap 
Patch by Robert Stupp, reviewed by Ariel Weisberg for CASSANDRA-7438
 2015-01-21 20:50:35 +01:00
Brandon Williams bea3a9703c Merge branch 'cassandra-2.1' into trunk 2015-01-19 13:47:57 -06:00
Brandon Williams d469b4b817 add missing jvm opts back 2015-01-19 13:47:49 -06:00
T Jake Luciani 895ec3ea1e Support direct buffer decompression for reads 
Patch by tjake; reviewed by Branimir Lambov for CASSANDRA-8464
 2015-01-16 09:38:42 -05:00
Sam Tunnicliffe 879b694d34 Introduce role based access control 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7653
 2015-01-14 22:48:39 +03:00
Aleksey Yeschenko 2fc3a8934b Merge branch 'cassandra-2.1' into trunk 2015-01-09 04:08:30 +03:00
Aleksey Yeschenko 8c5a959c97 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/Auth.java
	src/java/org/apache/cassandra/service/ClientState.java
 2015-01-09 04:08:05 +03:00
Sam Tunnicliffe e750ab238e Introduce background cache refreshing to permissions cache 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8194
 2015-01-09 04:02:32 +03:00
Brandon Williams 0f024a6192 Merge branch 'cassandra-2.1' into trunk 2015-01-06 08:25:56 -06:00
Brandon Williams e83304ddfe Use lexical comparison for java revisions 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-8315
 2015-01-06 08:24:48 -06:00
Joshua McKenzie 847fef8336 Merge branch 'cassandra-2.1' into trunk 2014-12-16 11:17:04 -06:00
Joshua McKenzie d66ae75387 Remove linux-centric references from windows launch scripts 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-8223
 2014-12-16 11:16:14 -06:00
Ben Chan f5866ca2ba Add repair tracing 
Patch by Ben Chan; reviewed by jmckenzie for CASSANDRA-5483
 2014-12-03 13:15:10 -06:00
Robert Stupp e13121318b Validate functionality of different JSR-223 providers in UDFs. 
patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7874
 2014-11-26 12:51:37 -08:00
Tyler Hobbs 699a69de8d Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:40:53 -06:00
blerer 1bb2dd906c Fix size calculations for prepared statements 
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
 2014-11-21 14:54:47 -06:00
Jake Luciani 4fd3349e2e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2014-11-05 15:44:03 -05:00
Jake Luciani 4f863be3f7 Fix Cassandra crash when running on JDK8 update 40 
Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
 2014-11-05 15:28:24 -05:00
Joshua McKenzie 374d0cbaed Merge branch 'cassandra-2.1' into trunk 2014-10-31 11:49:18 -05:00
Joshua McKenzie e3f4c6defc Abort startup if ports are in use (Windows) 
patch by jmckenzie, reviewed by pthompson for CASSANDRA-8179
 2014-10-31 11:47:11 -05:00
Joshua McKenzie e39dc56eda Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	test/unit/org/apache/cassandra/db/CommitLogTest.java
 2014-10-24 12:31:51 -05:00
Joshua McKenzie d4df271f75 Add 'die' policy for commit log and disk failure 
patch by John Sumsion and Josh McKenzie, reviewed by blerer for CASSANDRA-7927
 2014-10-24 12:27:20 -05:00
Joshua McKenzie 7dda131a5f Merge branch 'cassandra-2.1' into trunk 2014-10-22 12:13:39 -05:00
Joshua McKenzie 51b27f2078 Fix installing as service on Windows 
Patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-8115
 2014-10-22 12:09:12 -05:00
Brandon Williams 1d05e8ea7a Merge branch 'cassandra-2.1' into trunk 2014-10-16 11:58:00 -05:00
Brandon Williams 46c4f0b583 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-10-16 11:57:49 -05:00
Brandon Williams e93883988f Update yaml comment about rpc_max_threads with HSHA 
Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-8116
 2014-10-16 11:57:08 -05:00
Joshua McKenzie 861c4cf2de Integrate Sigar library and add basic OS performance checks on startup 
Patch by Amit Kumar and Josh McKenzie; reviewed by tjake for (CASSANDRA-7838)
 2014-10-09 12:32:57 -04:00
Joshua McKenzie 3afd0a86d3 Merge branch 'cassandra-2.1' into trunk 2014-10-06 15:14:24 -05:00
Joshua McKenzie b7609903b0 Warn on startup if swap file enabled on Windows 
patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7316
 2014-10-06 15:13:10 -05:00
Jonathan Ellis ada8d8b60b Fail on very large batch sizes 
patch by Carl Yeksigian; reviewed by Sankalp Kohli for CASSANDRA-8011
 2014-10-01 12:08:29 -05:00
Brandon Williams 796ddbc060 kill yaml snitch 2014-09-12 17:57:26 -05:00
Brandon Williams 2a6e0714a7 Add ability to detect unofficial openjdk builds. 
Patch by brandonwilliams, reviewed by enigmacurry for CASSANDRA-7799
 2014-08-27 10:12:39 -05:00
Brandon Williams cb62ef4019 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-08-27 10:11:20 -05:00
Brandon Williams 0e272c233d Add ability to detect unofficial openjdk builds. 
Patch by brandonwilliams, reviewed by enigmacurry for CASSANDRA-7799
 2014-08-27 10:08:18 -05:00
Benedict Elliott Smith 5aee12883d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-21 08:53:12 +07:00
Benedict Elliott Smith af646fb759 ninja fix cassandra.yaml missing memtable_(off)?heap_size_in_mb 2014-08-21 08:52:40 +07:00
Joshua McKenzie e00bb4a2a0 Add new CMS GC flags on Windows launch scripts for JVM > 7u60 
Patch by Josh McKenzie, reviewed by jbellis for CASSANDRA-7714
 2014-08-13 13:50:37 -05:00
Brandon Williams aab4711795 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-08-13 13:29:53 -05:00
Brandon Williams ed3694b868 export MALLOC_ARENA_MAX corrrectly 
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
 2014-08-13 13:29:42 -05:00
Brandon Williams efde6ae81b export MALLOC_ARENA_MAX corrrectly 
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
 2014-08-13 13:28:28 -05:00
Brandon Williams 304260d04e Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
 2014-08-06 12:57:05 -05:00
Sylvain Lebresne a7d950e363 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-06 12:13:20 +02:00
Brandon Williams 97e74eece4 Add CMSWaitDuration=10000 2014-08-05 17:54:50 -05:00
Brandon Williams 62838b93b1 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-08-05 17:53:40 -05:00
Brandon Williams f92291c621 Add new GC flags for java7/8 
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7432
 2014-08-05 17:52:48 -05:00
Jonathan Ellis d33e29accf merge from 2.1.0 2014-08-01 21:03:15 -05:00
Jonathan Ellis 41a85afe65 switch to notification-based GCInspector 
patch by Yuki Morishita, Brandon Williams, and jbellis for CASSANDRA-7638
 2014-08-01 20:59:32 -05:00
Tyler Hobbs 8d6b732684 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-30 15:59:27 -05:00
Tyler Hobbs 2107e30bdd Improve cqlsh waiting for a trace to complete 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7626
 2014-07-30 15:57:06 -05:00
Jonathan Ellis ef9473a039 merge from 2.1.0 2014-07-25 17:25:59 -05:00
Jonathan Ellis 6f15fe2609 update .ps1 line endings to CRLF 
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627
 2014-07-25 17:24:07 -05:00
Brandon Williams b2a37c7989 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 13:11:18 -05:00
Brandon Williams 5544ecbf64 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-25 13:11:08 -05:00
Brandon Williams f5e634c1cc update CL archive comments post-6905 2014-07-25 13:10:54 -05:00
Brandon Williams 3b14f6a5db Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-07-21 07:51:10 -05:00
Brandon Williams df7bd7f725 Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-21 07:50:18 -05:00
Brandon Williams 8754809585 Fix jvm version detection when JAVA_TOOL_OPTIONS in environment 
Patch by Gregory Ramsperger, reviewed by brandonwilliams for
CASSANDRA-7572
 2014-07-21 07:49:13 -05:00
Jonathan Ellis 367a3696b3 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-16 16:17:53 -05:00
Jonathan Ellis 545e2e1cba Merge branch 'cassandra-2.0' into cassandra-2.1.0 2014-07-16 16:17:44 -05:00
Jonathan Ellis 93c27549a3 update column_index_size_in_kb description 2014-07-16 16:17:34 -05:00
Jonathan Ellis 9a4cc22a3e Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-15 15:15:05 -05:00
Jonathan Ellis 3adf59486a memtable_cleanup_threshold and memtable_flush_writers defaults 
patch by jbellis; reviewed by bes for CASSANDRA-7551
 2014-07-15 15:14:56 -05:00
Jake Luciani f45a4e3a1e ninja change default back to heap_buffers 2014-07-14 17:11:57 -04:00
Jonathan Ellis 5e4b8f535f Add listen_interface and rpc_interface options 
patch by Matt Kennedy; reviewed by Tupshin Harper and jbellis for CASSANDRA-7417
 2014-07-11 23:36:13 -05:00
Jonathan Ellis f72d0247a7 merge from 2.1.0 2014-07-08 15:59:15 -05:00
Jonathan Ellis c29e48d7ac fix startup when WMI memory query fails 
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7505
 2014-07-08 15:58:30 -05:00
Jonathan Ellis aac8e6c7f0 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-07 00:13:50 -05:00
Jonathan Ellis 48ff36a457 Fix ClassCastException processing expired messages 
patch by Jason Brown; reviewed by tjake for CASSANDRA-7496
 2014-07-07 00:03:18 -05:00
vparthasarathy 4112a7fa27 Split out outgoing stream throughput within a DC and inter-DC 
patch by Vijay and benedict for CASSANDRA-6596
 2014-06-30 20:47:58 -07:00
Benedict Elliott Smith e77ea12520 Optimise CellName/Composite comparisons for NativeCell 
patch by Jake Luciani and Benedict Elliott Smith for CASSANDRA-6755
 2014-06-30 14:30:55 +01:00
Benedict Elliott Smith da3606e180 Merge commit failure policy into 2.1 
patch by Benedict Elliott Smith; reviewed by Marcus Eriksson for CASSANDRA-7429
 2014-06-30 13:00:42 +01:00
Jonathan Ellis b8ee9da1e8 (Windows) handle spaces in path names 
patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451
 2014-06-27 11:07:47 -05:00
Brandon Williams e8500c72c7 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-26 11:02:06 -05:00
Brandon Williams ac1d5bd56f Document initial_token/num_tokens behavior when both are set 
Patch by Philip Thompson, reviewed by brandonwilliams for CASSANDRA-7411
 2014-06-26 10:54:10 -05:00
Jonathan Ellis 1569bd9c4b clean out in_memory_compaction_limit 
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428
 2014-06-24 22:13:53 -05:00
Jonathan Ellis d6322a7ec2 fix heap size on Windows 32bit VM 
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353
 2014-06-18 14:01:04 -05:00
Jonathan Ellis b9153f4ae5 Modify system tcp keepalive settings in Windows install scripts 
patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348
 2014-06-12 15:05:04 -05:00
Brandon Williams ae8aad4745 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	conf/cassandra.yaml
	src/java/org/apache/cassandra/transport/Server.java
 2014-06-12 09:46:56 -05:00
Brandon Williams b48a17bfbb Enabled keepalive for native protocol 
Patch by brandonwilliams, reviewed by Sankalp Kohli for CASSANDRA-7380
 2014-06-12 09:30:29 -05:00
Tyler Hobbs 60be74230e Use $CASSANDRA_HOME for default paths instead of /var 
Patch by Tyler Hobbs; reviewed by Brandon Williams and Joshua McKenzie
for CASSANDRA-7136
 2014-06-05 15:38:41 -05:00
Jonathan Ellis b29d882df8 Fix heap size calculation on Windows 
patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352
 2014-06-05 10:23:15 -05:00
belliottsmith ee950b4103 Revert flush directory (CASSANDRA-6357) 
Patch by Jonathan Ellis; reviewed by Benedict Elliott Smith
 2014-05-29 22:37:50 +01:00
Jonathan Ellis e00878d955 Change concurrent_compactors defaults 
patch by jbellis; reviewed by bes for CASSANDRA-7139
 2014-05-21 13:11:16 -05:00
Jonathan Ellis 1927d5ec72 Add PowerShell Windows launch scripts 
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7001
 2014-05-14 09:09:51 -07:00
Dave Brosius 1b1f0b0790 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-08 00:39:13 -04:00
Dave Brosius 16fd1a4a89 fix c* launch issues on Russian os's due to output of linux 'free' cmd 
patch by dbrosius reviewed by bwilliams for cassandra-6162
 2014-05-08 00:32:29 -04:00
Brandon Williams 8c58dd30e1 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	conf/cassandra-env.sh
 2014-05-07 16:24:43 -05:00
Brandon Williams ea0c399912 Improve error message when trying >= 2.0 on java < 1.7 
Patch by brandonwilliams reviewed by thobbs for CASSANDRA-7137
 2014-05-07 16:23:11 -05:00
Sylvain Lebresne 48727b4ccb Update versions and add licenses for 2.1-beta2 release 2014-05-01 16:40:15 +02:00
Pavel Yaskevich 8541cca718 Push more of memtable data off-heap 
patch by benedict & xedin; reviewed by benedict, iamaleksey & xedin for CASSANDRA-6694
 2014-04-29 13:58:20 +02:00
Vijay d402cf6870 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
 2014-04-28 21:38:22 -07:00
Brandon Williams ab87f8334a Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-04-24 14:48:54 -05:00
Brandon Williams b9bb2c8868 Set JMX RMI port to 7199 
Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7087
 2014-04-24 14:48:25 -05:00
belliottsmith 4e95953f29 Preemptive open of compaction results 
Patch by benedict; reviewed by marcuse for CASSANDRA-6916
 2014-04-23 16:25:02 +02:00
Jonathan Ellis b3a225ef10 Increase default CL space to 8GB 
patch by Benedict Elliott Smith; tested by Ryan McGuire and reviewed by jbellis for CASSANDRA-7031
 2014-04-23 07:25:35 -05:00
Jonathan Ellis 510c82e4e7 merge from 2.0 2014-04-22 07:41:27 -05:00
Jonathan Ellis de720b4aa3 Log a warning for large batches 
patch by Lyuben Todorov; reviewed by Benedict Elliott Smith for CASSANDRA-6487
 2014-04-22 07:40:32 -05:00
Brandon Williams 02d1e7497a Default flush dir to data dir. 
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064
 2014-04-21 14:42:29 -05:00
Pavel Yaskevich 1a3b5dbcb5 Add multiple memory allocation options for memtables 
patch by benedict and xedin; reviewed by marcuse and xedin for CASSANDRA-6689
 2014-03-25 14:21:07 -07:00
Jonathan Ellis 0cd17695f6 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-25 13:28:52 -05:00
Jonathan Ellis f8229c3fb2 update comments for partitioner and snitch 2014-03-25 13:28:45 -05:00
Vijay fbc112d4b5 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
 2014-03-22 19:27:17 -07:00
Marcus Eriksson 35b2151369 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/CassandraDaemon.java
 2014-03-18 08:09:02 +01:00
Marcus Eriksson 850cd59ca4 Add paranoid disk failure option. 
Patch by marcuse, reviewed by kohlisankalp and jbellis for CASSANDRA-6646
 2014-03-18 07:52:30 +01:00
Brandon Williams ceddff58f3 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-03-17 12:08:10 -05:00
Brandon Williams 98ed6a4be0 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-03-17 12:07:00 -05:00
Brandon Williams 3876eefd11 Add extra SSL cipher suites. 
Patch by brandonwilliams, reviewed by Ray Sinnema for CASSANDRA-6613
 2014-03-17 12:05:35 -05:00
Lewis John McGibbney 4bed978ae4 Add in forgotten MX4J variables to cassandra-env.sh 
patch by Lewis John McGibbney; reviewed by Mikhail Stepura for CASSANDRA-6518
 2014-03-16 11:34:36 -07:00
Mikhail Stepura caf609cf6f Switch cqlsh from cassandra-dbapi2 to python-driver 
patch by Mikhail Stepura for CASSANDRA-6307; reviewed by Aleksey Yeschenko and Tyler Hobbs
 2014-03-12 15:02:14 -07:00
Tyler Hobbs 893c11f545 Add broadcast_rpc_address option to cassandra.yaml 
Patch by Tyler Hobbs, reviewed by Jason Brown for CASSANDRA-5899
 2014-03-07 13:09:05 -06:00
Sylvain Lebresne 724eabedc2 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
 2014-03-04 11:51:54 +01:00
Brandon Williams fd53628cb0 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-02-28 15:14:24 -06:00
Brandon Williams f08ae394f0 Add CMSClassUnloadingEnabled JVM option 
Patch by Jonathan Lacefield, reviewed by brandonwilliams for
CASSANDRA-6541
 2014-02-28 15:11:50 -06:00
Jonathan Ellis a6f5f361ca Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-28 10:41:12 -06:00
Jonathan Ellis 5b80b97ded merge from 1.2 2014-02-28 10:40:43 -06:00
Jonathan Ellis e5b92d8ad3 r/m populate_io_cache_on_flush from yaml (per-table since #4694) 2014-02-28 10:40:07 -06:00
Jonathan Ellis f628bd8a4d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-18 11:22:24 -06:00
Jonathan Ellis 500c62d6b9 Allow per-dc enabling of hints 
patch by Sankalp Kohli; reviewed by Lyuben Todorov for CASSANDRA-6157
 2014-02-18 11:21:13 -06:00
vparthasarathy 94bda1f7d3 Split out outgoing stream throughput within a DC and inter-DC 
patch by Vijay and benedict for CASSANDRA-6596
 2014-02-15 12:25:14 -08:00
Jonathan Ellis ee020c9446 Revert 6157 until we can commit to 2.0 and merge forwards 
This reverts commit f64b31c426.
 2014-02-15 11:38:51 -06:00
Jonathan Ellis f64b31c426 wip 2014-02-15 10:18:12 -06:00
Jonathan Ellis f10148f4f1 Add flush directory distinct from compaction directories 
patch by jbellis and aleksey for CASSANDRA-6357
 2014-02-15 10:11:28 -06:00
Marcus Eriksson 9381b8d569 Add commit_failure_policy. 
Patch by belliottsmith, reviewed by marcuse for CASSANDRA-6364

CASSANDRA-6364
 2014-02-11 13:13:37 +01:00
Jonathan Ellis 4b54b8acd2 remove Table.switchlock and introduce o.a.c.utils.memory package 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-5549
 2014-01-30 17:09:18 -06:00
Brandon Williams 35c78d6a94 Backport 6190 2014-01-29 08:56:03 -06:00
Aleksey Yeschenko 714c423360 New counters implementation 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6504
 2014-01-27 16:37:41 -06:00
Brandon Williams 1218bcacba clarify yaml comment about commitlog_periodic_queue_size 2014-01-27 16:22:30 -06:00
Brandon Williams b9260092da Merge branch 'cassandra-2.0' into trunk 2014-01-22 15:32:23 -06:00
Brandon Williams 6348ce0cc5 fix yaml comment for 6059 2014-01-22 15:32:17 -06:00
Brandon Williams f642835695 Add example jmx auth file location 
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
 2014-01-17 11:07:26 -06:00
Brandon Williams 886ac6adc0 Add example jmx auth file location 
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
 2014-01-17 11:07:22 -06:00
Brandon Williams b78617b226 Add example jmx auth file location 
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
 2014-01-17 11:07:12 -06:00
Aleksey Yeschenko c8a0a3a689 Pre-6504 cleanup and fixups 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6504
 2014-01-17 03:41:20 +03:00
Brandon Williams 379212d5de Fix logback config in scripts and packaging. 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530
 2014-01-10 09:31:12 -06:00
Aleksey Yeschenko 59c996212c Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
 2014-01-05 03:26:20 +03:00
Aleksey Yeschenko 95f1b5f298 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
 2014-01-05 03:18:49 +03:00
Aleksey Yeschenko 2a7c20ea91 Add ability to throttle batchlog replay 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6550
 2014-01-05 03:06:47 +03:00
Jonathan Ellis 1c38fbf9d9 re-enable assertions by default 2014-01-03 20:29:08 -06:00
Jonathan Ellis 412b053ca1 replace SnapTreeMap/AtomicSortedColumns with BTree/AtomicBTreeColumns 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6271
 2014-01-03 19:11:20 -06:00
Jonathan Ellis 57516e082b Merge branch 'cassandra-2.0' into trunk 2013-12-02 21:39:20 -06:00
Jonathan Ellis 6724964308 Reduce gossip memory use by interning VersionedValue strings 
patch by jbellis; tested by Quentin Conner for CASSANDRA-6410
 2013-12-02 21:36:22 -06:00
Jonathan Ellis bb60ad35bc show how to make logback formatting match pre-2.1 default format 2013-11-27 11:34:15 -06:00
Jonathan Ellis c1d7291c8d Merge branch 'cassandra-2.0' into trunk 2013-11-26 15:19:11 -06:00
Jonathan Ellis 8e82590506 merge from 1.2 2013-11-26 15:18:53 -06:00
Jonathan Ellis 3f66fbfc63 r/m debug output 2013-11-26 15:18:09 -06:00
Jonathan Ellis dbd1a727b7 allocate fixed index summary memory pool and resample cold index summaries to use less memory 
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5519
 2013-11-22 12:12:55 -06:00
Dave Brosius 1141b82d68 fix file logger layout to not dump stacktrace over lines 2013-11-19 20:02:21 -05:00
Jonathan Ellis 50970320de Bump Xss to 256k to match 2.0+ (CASSANDRA-5517) 2013-11-19 16:42:32 -06:00
Sylvain Lebresne 2bbabe154e Merge branch 'cassandra-2.0' into trunk 2013-11-04 16:13:06 +01:00
Sylvain Lebresne 4a439d22c5 Error out correctly when frame is too large 
patch by slebresne; reviewed by dnorberg for CASSANDRA-5981
 2013-11-04 16:12:02 +01:00
Jonathan Ellis 36cdf34bd9 Remove multithreaded compaction and PCR 
patch by jbellis; reviewed by marcuse for CASSANDRA-6142
 2013-10-30 10:17:23 -05:00
Brandon Williams db5c95cdc5 Merge branch 'cassandra-2.0' into trunk 2013-10-25 15:28:28 -05:00
Brandon Williams 1bd7ac3c4b Only pass UseCondCardMark to 64bit JVMs 
Patch by brandonwilliams, reviewed by eevans for CASSANDRA-6190
 2013-10-25 15:28:22 -05:00
Brandon Williams 0b3a0a6177 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	conf/cassandra-env.sh
 2013-10-14 12:49:16 -05:00
Brandon Williams b0b868f3fc fix missing then 2013-10-14 12:48:54 -05:00
Brandon Williams 9ef53836c2 Set MALLOC_ARENA_MAX when unset. 
Patch by brandonwilliams for CASSANDRA-6126
 2013-10-14 12:41:39 -05:00
Brandon Williams 6133541364 Set MALLOC_ARENA_MAX when unset. 
Patch by brandonwilliams for CASSANDRA-6126
 2013-10-14 12:40:22 -05:00
Jonathan Ellis 241aea0576 Merge branch 'cassandra-2.0' into trunk 2013-10-09 08:32:05 -05:00
Jonathan Ellis 2f31bde61e update Thrift server comment 2013-10-09 08:31:57 -05:00
Jonathan Ellis 023589bf30 Merge branch 'cassandra-2.0' into trunk 2013-10-01 14:25:57 -05:00
Jonathan Ellis 32c3f44a68 Add configurable metrics reporting 
patch by Chris Burroughs; reviewed by Tyler Hobbs for CASSANDRA-4430
 2013-10-01 14:25:42 -05:00
Jonathan Ellis ca697d5913 Merge branch 'cassandra-2.0' into trunk 2013-10-01 14:20:53 -05:00
Jonathan Ellis dc7221f0bf warn, then drop queries exceeding a configurable number of tombstones 
patch by jbellis; reviewed by slebresne for CASSANDRA-6117
 2013-10-01 14:20:44 -05:00
Jonathan Ellis bce594f38b Merge branch 'cassandra-2.0' into trunk 2013-09-26 17:10:51 -05:00
Jonathan Ellis 2fb089e4c8 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-26 17:10:39 -05:00
Jonathan Ellis bdb269af00 stronger warning to avoid 0.0.0.0 rpc_address 2013-09-26 17:10:21 -05:00
Jonathan Ellis eb125ad78b Merge branch 'cassandra-2.0' into trunk 2013-09-23 13:33:46 -05:00
Jonathan Ellis 52b4fc3933 merge from 1.2 2013-09-23 13:33:38 -05:00
Jonathan Ellis 2267c20942 Add tombstone debug threshold and histogram 
patch by Russell Spitzer and Lyuben Todorov; reviewed by jbellis for CASSANDRA-6042 and CASSANDRA-6057
 2013-09-23 12:39:46 -05:00
Jonathan Ellis fee30d5ad6 merge from 2.0 2013-09-19 14:41:06 -05:00
Jonathan Ellis 72be2a4360 improve memory use and timeout defaults 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6059
 2013-09-19 14:37:33 -05:00
Dave Brosius 4ba8e3c556 fix error in logback config files, causing INFO to spew unwantedly 2013-09-17 22:09:42 -04:00
Jonathan Ellis 07b4878b04 Revert "add file_cache_size_in_mb setting" 
This reverts commit dfe4937609.
 2013-09-17 17:17:05 -05:00
Jonathan Ellis 494ba4582b Merge branch 'cassandra-2.0' into trunk 2013-09-17 16:57:59 -05:00
Jonathan Ellis 1e0d9513b7 merge from 1.2 2013-09-17 16:57:52 -05:00
Jonathan Ellis dfe4937609 add file_cache_size_in_mb setting 
patch by pyaskevich and jbellis for CASSANDRA-5661
 2013-09-17 16:53:11 -05:00
Jonathan Ellis 889ca1f504 Merge branch 'cassandra-2.0' into trunk 2013-09-17 12:14:18 -05:00
Jonathan Ellis 83b0b2fb5b merge from 1.2 2013-09-17 12:12:04 -05:00