Commit Graph

278 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 b111610fac merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097473 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 14:20:59 +00:00
Jonathan Ellis 2d95cb4957 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095492 13f79535-47bb-0310-9956-ffa450edef68
2011-04-20 19:50:50 +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
Jonathan Ellis 58307994b5 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1091784 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 13:59:39 +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 8c7bc2fe87 push replication_factor into strategy_options
patch by jhermes and jbellis; reviewed by jhanna for CASSANDRA-1263

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090905 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 22:59:57 +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 c8d1984bf1 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090062 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 23:24:44 +00:00
Jonathan Ellis 705cd1e8bb add date in seconds-since-epoch to default gc log filename
patch by Chris Burroughs and jbellis for CASSANDRA-2418

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1089924 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 15:54:24 +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 0babdf4b98 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1086406 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 21:21:29 +00:00
Jonathan Ellis 469f947cf7 specify UTF8Type comparator to fix regression found by Jingguo Yao
patch by jbellis for CASSANDRA-2390

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1085877 13f79535-47bb-0310-9956-ffa450edef68
2011-03-27 05:28:41 +00:00
Jonathan Ellis f9259e4f0a merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1084315 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 19:36:18 +00:00
Jonathan Ellis 7f44ccce4a fix file name in schema-sample.txt
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1083797 13f79535-47bb-0310-9956-ffa450edef68
2011-03-21 14:20:54 +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 c49a01b5b9 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081899 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 18:42: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
Brandon Williams eeacacc0d3 Add comments to topology file about ipv6 configuration.
Patch by Eric Tamme, reviewed by brandonwilliams for CASSANDRA-2329

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081859 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 17:06:24 +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 cb7a1e475d revert log4j change, again
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1079647 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 02:42:49 +00:00
Jonathan Ellis 929f430da9 add more information to scrub errors
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1079645 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 02:42:20 +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 4c1780a385 revert log level commit
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1074617 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 16:22:35 +00:00
Jonathan Ellis f65cf20a54 add some debug logging to scrub
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1074616 13f79535-47bb-0310-9956-ffa450edef68
2011-02-25 16:22:14 +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
Brandon Williams b5a101b32c Merge from 0.7. I hope.
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1067508 13f79535-47bb-0310-9956-ffa450edef68
2011-02-05 20:19:31 +00:00
Jonathan Ellis 54b0a22225 add sample -Xdebug line con configuration file
patch by mdennis; reviewed by jbellis for CASSANDRA-2114

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1067386 13f79535-47bb-0310-9956-ffa450edef68
2011-02-05 03:58:28 +00:00