9b892b186a
clean up unused code; add comments. patch by jbellis for CASSANDRA-488
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828084 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 16:24:14 +00:00
0a8f46507f
reformat whitespace. patch by jbellis for CASSANDRA-488
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828083 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 16:24:11 +00:00
1f63a4aac1
ignore hidden files in commitlog directory (useful for users on OS X, which likes to add files like ".DS_Store"). patch by gdusbabek; reviewed by jbellis for CASSANDRA-503
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828076 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 16:09:08 +00:00
d5eaa4e141
Make EndPoint objects immmutable, so hashcode can't change (making the EndPoint potentially disappear from a map)
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828030 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 14:18:24 +00:00
7dbbca6698
make write targets computable independent of replication strategy (i.e., make getReadStorageEndPoints the only method a Strategy needs to implement). we do this by computing the token/endpoint -> Range[] map from the read endpoints, then using that to determine if a bootstrapping node needs to receive a write (if the token being written falls in any of its ranges). Also, make the StorageProxy insert methods aware that bootstrap can entail having extra write targets temporarily, and include those in its consistencylevel calculations.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828029 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 14:18:18 +00:00
93b0b062c2
rename nodePicker -> replicationStrategy.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-497
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828028 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 14:18:09 +00:00
dcdb8e1b85
export specific keys passed on command line
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827796 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 21:10:53 +00:00
34207f0a92
CASSANDRA-499 null-out row member on seekTo()
...
Otherwise a later call to IteratingRow.skipRemaining() (from next())
will undermine the seek.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827795 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 21:10:43 +00:00
b0e6053b85
add test catching regression; call removeDeleted during compaction.
...
patch by jbellis; reviewed by eevans for CASSANDRA-500
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827761 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 18:41:19 +00:00
e659b06f3a
fix HH to not give up when any node is live
...
patch by jbellis; reviewed by eevans for CASSANDRA-496
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827744 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:48:52 +00:00
d4a8f07cd8
inline getNextAvailable
...
patch by jbellis; reviewed by eevans for CASSANDRA-496
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827743 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:48:49 +00:00
c1e22db3bf
Avoid using non-existent supercolumn timestamp in delete op. Better conceptual integrity to delete w/ correct system time anyway.
...
patch by jbellis; reviewed by junrao for CASSANDRA-491
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827742 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:45:29 +00:00
eeb164e2c0
fix HH of tombstones. patch by jbellis; reviewed by junrao for CASSANDRA-491
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@827741 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 17:45:22 +00:00
06bd3f069a
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@826917 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 00:33:00 +00:00
f98f69cb9b
merge from 0.4
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@826095 13f79535-47bb-0310-9956-ffa450edef68
2009-10-16 21:28:18 +00:00
360d3559ec
merge from 0.4
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@826078 13f79535-47bb-0310-9956-ffa450edef68
2009-10-16 20:40:44 +00:00
b1c5077f44
fix token to cover (left, right] like the rest of Cassandra (and Range.toString). patch by Stu Hood; reviewed by jbellis for CASSANDRA-495
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825684 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 22:21:15 +00:00
079920ae70
convert bytes to hex for BytesType.getString()
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825619 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 19:02:54 +00:00
417e7c0373
basic json exporter for sstables
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825618 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 19:02:47 +00:00
074eef97d6
merging with 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@825333 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 23:07:44 +00:00
e2a9e87771
merging 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824965 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 22:54:07 +00:00
c88e13cdc6
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824816 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 15:48:53 +00:00
bdb7bda5e0
move callback synchronization into ResponseVerbHandler where it's less likely to be a maintenance problem
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824477 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:58 +00:00
1782c886fa
r/m unused attachContext.
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824476 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:52 +00:00
93ad8a2e42
cleanup Message; add asserts
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824475 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:45 +00:00
78f7a35ae3
logging & cleanup in ConsistencyManager
...
patch by jbellis for CASSANDRA-478
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824474 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:57:40 +00:00
c12b11b566
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824464 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:18:45 +00:00
816a45b62a
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824459 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 19:08:51 +00:00
f6b95bf0e5
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824426 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 17:10:53 +00:00
735435be69
add AutoBootstrap config option
...
patch by jbellis. reviewed by goffinet for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824007 13f79535-47bb-0310-9956-ffa450edef68
2009-10-11 03:22:15 +00:00
93a88e61c8
pass -D arguments to the jvm from startup script
...
Let getopt parse -D options passed to the script, reconstruct them, and
pass them on to the vm.
Patch by eevans; review by jbellis for CASSANDRA-374
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823637 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:49:59 +00:00
4a4b8bebf7
fix regressions
...
patch by jbellis reviewed by Eric Evans for CASSANDRA-477
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823617 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:07:24 +00:00
51ec66cccb
move bootstrap-related code into Bootstrapper
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-477
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823616 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:07:14 +00:00
3e3ebc3fb3
expose additional metrics for executors. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-482
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823562 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 14:28:40 +00:00
6d070498be
r/m undocumented term aliases in favor of a single 'comment' field.
...
patch by jbellis and Brandon Williams; reviewed by Michael Greene for CASSANDRA-481
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823349 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 22:30:55 +00:00
ba98fa4797
Fail startup if <seeds> is empty. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-479
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823264 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 18:38:36 +00:00
294bfa9a21
Added the ability to set maxthreshold to zero in nodeprobe, and added a special case to CF.doCompaction to not run compaction when its disabled. patch by goffinet; reviewed by jbellis for CASSANDRA-465
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822931 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 21:47:38 +00:00
6480460d01
merge from 0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822880 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:58:56 +00:00
3329f5ec98
create new collection when reducing the number of sstables compacted; the lists returned by subList are unmodifiable
...
patch by jbellis; reviewed by goffinet for CASSANDRA-473
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822878 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:48:59 +00:00
303951c458
r/m nodeprobe bootstrap
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-438
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822877 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:42:01 +00:00
ff3dd4dcec
add autobootstrap
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-438
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822876 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:41:47 +00:00
fe1aa5b52d
rename LOCATION_CF -> STATUS_CF. cleanup.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-438
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822875 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 19:41:36 +00:00
5e9b35cc8c
rename getMessagingInstance -> instance; r/m unused methods from FBUtiltities
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822793 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:43 +00:00
103a13c68f
get token on bootstrap that gives us half of the keys from the most heavily-loaded node. (the "splits" approach should also be useful for #342 ; adding it to Thrift is trivial)
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822792 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:31 +00:00
02a569e384
add getLoadMap jmx method; add load info to nodeprobe ring
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822791 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:24 +00:00
d1a8e1322f
use Strings instead of Endpoints in jmx methods. merge cluster info into ring.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822790 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:20 +00:00
ece6e6d459
move javadoc into mbean. inline methods where wrapping is not necessary to satisfy Demeter
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822789 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:14 +00:00
4a0378eb85
make LoadInfo a double instead of going from long -> string -> LoadInfo -> int
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822788 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:10 +00:00
becb0b1c7a
clean up loadinfo and SLB
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-385
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822787 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:23:05 +00:00
8fb1546303
CASSANDRA-457 cassandra client with a web-based interface
...
Patch by Jun Rao, Hernan Badenes, and Michael Greene;
reviewed by eevans for CASSANDRA-457
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@822786 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 16:22:08 +00:00
Jonathan Ellis