Commit Graph

116 Commits

Author SHA1 Message Date
Jonathan Ellis ae7dbe3d2a merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1125113 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 21:19:30 +00:00
Sylvain Lebresne d128ed1184 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1099343 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04 07:10:30 +00:00
Sylvain Lebresne 7a49fb0797 merge CASSANDRA-2558 from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097889 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 17:09:26 +00:00
Jonathan Ellis 1adcd1c52e merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095139 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 17:13:19 +00:00
Sylvain Lebresne 32ac6ee760 Compaction throttling
patch by stuhood; reviewed by slebresne for CASSANDRA-2156


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090979 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 08:45:07 +00:00
Sylvain Lebresne beac419bd3 Multithreaded compactions
patch by stuhood; reviewed by slebresne for CASSANDRA-2191


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090978 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 08:36:55 +00:00
Jonathan Ellis f4b3c01dff add a server-wide cap on memtable memory usage
patch by jbellis; reviewed by Stu Hood for CASSANDRA-2006

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090064 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 23:49:06 +00:00
Jonathan Ellis 6d2f24cd63 Revert prematurely-committed "add a server-wide cap on memtable memory usage"
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089526 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 16:33:35 +00:00
Jonathan Ellis a287f42ceb add a server-wide cap on memtable memory usage
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089521 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 16:21:17 +00:00
Jonathan Ellis be44f37e27 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081925 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 20:12:03 +00:00
Jonathan Ellis 4ef269d017 add memtable_flush_queue_size defaulting to 4
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2333

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081908 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 19:08:11 +00:00
Jonathan Ellis 139203d25e merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081872 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 17:31:28 +00:00
Jonathan Ellis 0ee0bc6d7b r/m disk_access_mode from sample yaml
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081586 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 22:19:10 +00:00
Brandon Williams 1c12d7bd9c Remove binary_memtable_throughput_in_mb from yaml to avoid confusion
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080806 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 23:55:08 +00:00
Jonathan Ellis 1a5d09c356 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080338 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 20:28:17 +00:00
Jonathan Ellis 21622125f3 fix commitlog replaywhen flush position refers to data thatdidnt
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1079989 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 20:52:03 +00:00
Jonathan Ellis 88631680ed merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1079952 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 19:23:53 +00:00
Jonathan Ellis fc4502acf0 revert r1078803 (#1902)
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1079812 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 14:27:46 +00:00
Jonathan Ellis fffecb84f9 move sample schema from cassandra.yaml to schema-sample.txt (backport of r1079462)
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1079465 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 18:21:00 +00:00
Jonathan Ellis 7eb445bfc9 move keyspace1 sample config out of cassandra.yaml
patch by Aaron Morton; reviewed by jbellis for CASSANDRA-2007

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1079462 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 18:13:49 +00:00
Jonathan Ellis ade3581fb2 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1078860 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 17:33:53 +00:00
Jonathan Ellis cb71747c88 add incremental_backups option
patch by Yang Yang and jbellis for CASSANDRA-1872

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1078858 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 17:30:07 +00:00
T Jake Luciani c44cd01116 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1078831 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 16:19:34 +00:00
T Jake Luciani 7ed395de8e Track and Migrate cached pages during compaction
patch by Jake Luciani; reviewed by Pavel Yaskevich and jbellis for CASSANDRA-1902


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1078803 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 15:06:33 +00:00
Brandon Williams 57cb800ec1 Merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1078069 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 17:46:20 +00:00
Jonathan Ellis 82dd73b3a5 add rpc_[min|max]_threads
patch by tjake and jbellis for CASSANDRA-2176

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1077994 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 15:13:53 +00:00
Jonathan Ellis c39baf5024 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1072184 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 22:52:22 +00:00
Jonathan Ellis 534d24faa6 merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1071786 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17 21:03:34 +00:00
Jonathan Ellis dc3d5bc004 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1071388 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 20:37:17 +00:00
Jonathan Ellis 13c45ad774 merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1071069 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 21:16:50 +00:00
Jonathan Ellis 269fff789c merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1070541 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 16:06:50 +00:00
Jonathan Ellis 5e1820487d add flush_largest_memtables_at and reduce_cache_sizes_at options
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2142

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1069119 13f79535-47bb-0310-9956-ffa450edef68
2011-02-09 21:22:01 +00:00
Jonathan Ellis d00fe774cf merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1065827 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 22:12:43 +00:00
Gary Dusbabek 16be8fa7f0 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1065676 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 16:30:16 +00:00
Jonathan Ellis 0928a4fd11 set default snitch back to Simple
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1065669 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 16:16:44 +00:00
Jonathan Ellis d3329d28a1 move initialization out of constructor where possible
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1065660 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31 16:02:21 +00:00
Brandon Williams 887bbb7a1e Revert "Move demo Keyspace1 definition from casandra.yaml to an input file"
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1063441 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 20:24:44 +00:00
Brandon Williams 80371cd1b4 Move demo Keyspace1 definition from casandra.yaml to an input file for
cassandra-cli.
Patch by Aaron Morton, reviewed by brandonwilliams for CASSANDRA-2007

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1063434 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 20:06:37 +00:00
Jonathan Ellis f72f587bb7 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1061955 13f79535-47bb-0310-9956-ffa450edef68
2011-01-21 18:33:09 +00:00
Jonathan Ellis cd9eba9049 set out-of-the-box hint window to one hour
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1061560 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20 23:00:03 +00:00
Brandon Williams 60b848b43f Add a configurable maximum amount of time to hint for a dead host.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-1459

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1061557 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20 22:53:11 +00:00
Gary Dusbabek b1c2ce2210 configurable internode encryption. patch by rnirmal, reviewed by gdusbabek. CASSANDRA-1567
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1060890 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 18:10:35 +00:00
Jonathan Ellis 97630d1f9b merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1059145 13f79535-47bb-0310-9956-ffa450edef68
2011-01-14 19:53:00 +00:00
Jonathan Ellis 55a7afb6de update concurrent_reads default setting + comments
patch by Stu Hood; reviewed by jbellis for CASSANDRA-1972

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1059124 13f79535-47bb-0310-9956-ffa450edef68
2011-01-14 19:13:44 +00:00
Jonathan Ellis 71f002849b make NetworkTopologyStrategy the default
patch by Pavel Yaskevich; reviewed by brandonwilliams for CASSANDRA-1960

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1058797 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 23:38:55 +00:00
Jonathan Ellis 936b46427a revert r1058764
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1058793 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 23:23:14 +00:00
Brandon Williams 8dffb10d6c Make NetworkTopologyStrategy the default.
Patch by Pavel Yaskevich, reviewed by brandonwilliams for CASSANDRA-1960

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1058764 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 22:13:45 +00:00
Eric Evans ce10745331 merge w/ 0.7 branch
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1054727 13f79535-47bb-0310-9956-ffa450edef68
2011-01-03 20:05:00 +00:00
Jonathan Ellis ff1009511e merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1054687 13f79535-47bb-0310-9956-ffa450edef68
2011-01-03 17:05:16 +00:00
Gary Dusbabek 592970a87b merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1053717 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 19:43:22 +00:00